Upgrade to Methadone 1.9.1

.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p392
+2.2.2

.travis.yml

@@ -3,11 +3,9 @@ notifications:
     on_success: always
 script: 'bundle exec rake'
 rvm:
-  - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - ree
-#  - rbx # Removed because travis is choking on rbx and doesn't find rbx-2.0.0-rc1 which was tested locally 
-  - jruby-18mode
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - 2.2.2
   - jruby-19mode

Gemfile

@@ -1,5 +1,6 @@
 source 'http://www.rubygems.org'
 
 gem 'open4', :platform => :ruby_18
+gem 'test-unit'
 # Specify your gem's dependencies in methadone.gemspec
 gemspec

README.rdoc

@@ -51,15 +51,12 @@ http://a1.mzstatic.com/us/r30/Publication/v4/2c/f7/90/2cf7902f-f709-9125-c73d-87
 == Platforms
 
 * The build runs on Travis for:
-  * MRI Ruby 1.8.7
   * MRI Ruby 1.9.2
   * MRI Ruby 1.9.3
-  * RBX
-  * REE
+  * MRI Ruby 2.0.0
+  * MRI Ruby 2.1.0
   * JRuby in both 1.8 and 1.9 mode
 
-It should work on 2.0.0 but there's a weird bundler issue where some of the aruba tests fail in odd ways.
-
 == Bootstrapping a new CLI App
 
 The +methadone+ command-line app will bootstrap a new command-line app, setting up a proper gem structure, unit tests, and cucumber-based tests with aruba:
@@ -148,7 +145,7 @@ Methadone::CLILogger is designed to handle this.  It's a proper subclass of Ruby
 See {CLILogger's rdoc}[http://davetron5000.github.com/methadone/rdoc/classes/Methadone/CLILogger.html] and then {CLILogging's}[http://davetron5000.github.com/methadone/rdoc/classes/Methadone/CLILogging.html] for more.
 
 
-Currently, there are classes the assist in directing output logger-style to the right place; basically ensuring that errors go to +STDERR+ and everything else goes to +STDOUT+.  All of this is, of course, configurable
+Currently, there are classes that assist in directing output logger-style to the right place; basically ensuring that errors go to +STDERR+ and everything else goes to +STDOUT+.  All of this is, of course, configurable
 
 == Cucumber Steps
 

bin/methadone

@@ -70,10 +70,29 @@ main do |app_name|
     copy_file "test/tc_something.rb", :from => :test_unit, :binding => binding
   end
 
+  gemspec = "#{gemname}.gemspec"
+  gem_variable = File.open(gemspec) { |x| x.read }.match(/(\w+)\.executables/)[1]
+
   license = options[:license]
   warn "warning: your app has no license" unless license
   license = nil if license == 'NONE'
-  copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt" if license
+  if license
+    copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt" 
+  else
+    #Remove the MIT license generated by `bundle gem`
+    debug "Making sure no LICENSE.txt file exists at the root of the repo"
+    FileUtils.rm_f "LICENSE.txt"
+  end
+
+  #Ensure the gemspec file mentions the correct license
+  gemspec_content = File.read(gemspec)
+  if gemspec_content =~ /(^\s*#{gem_variable}\.license\s*=\s*).*/
+    gemspec_content.gsub!(/(^\s*#{gem_variable}\.license\s*=\s*).*/,"\\1#{license.to_s.inspect}")
+  else
+    gemspec_content.gsub!(/(^\s*#{gem_variable}\.name\s*=\s*.*)/,"\\1\n  #{gem_variable}.license=#{license.to_s.inspect}")
+  end
+  File.open(gemspec,'w') {|f| f.write gemspec_content }
+
 
   # TODO: bundle gem creates README.md regardless of using_readme setting.
   copy_file "README.rdoc", :binding => binding if using_readme
@@ -82,20 +101,27 @@ main do |app_name|
   copy_file "features/step_definitions/executable_steps.rb", :as => "#{gemname}_steps.rb"
   copy_file "bin/executable", :as => gemname, :executable => true, :binding => binding, :from => (multi ? :multicommand : :full)
 
-  gemspec = "#{gemname}.gemspec"
-  gem_variable = File.open(gemspec) { |x| x.read }.match(/(\w+)\.executables/)[1]
   add_to_file gemspec, [
     "  #{gem_variable}.add_development_dependency('rdoc')",
     "  #{gem_variable}.add_development_dependency('aruba')",
-    "  #{gem_variable}.add_development_dependency('rake', '~> 0.9.2')",
+    "  #{gem_variable}.add_development_dependency('rake')",
     "  #{gem_variable}.add_dependency('methadone', '~> #{Methadone::VERSION}')",
   ], :before => /^end\s*$/
+  ruby_major,ruby_minor,ruby_patch = RUBY_VERSION.split(/\./).map(&:to_i)
+
+  if ruby_major >= 2 && ruby_minor >= 2
+    add_to_file gemspec, [
+      "  #{gem_variable}.add_development_dependency('test-unit')",
+    ], :before => /^end\s*$/
+  end
 
   if rspec
     add_to_file gemspec, [
-    "  #{gem_variable}.add_development_dependency('rspec')",
+    "  #{gem_variable}.add_development_dependency('rspec', '~> 3')",
     ], :before => /^end\s*$/
   end
+
+  sh! %q(git add --all .)
 end
 
 options[:readme] = true
@@ -116,7 +142,7 @@ on "-c cmd1,cmd2,cmdN", "--commands", Array, "Generate framework for a cli app t
   end
 end
 
-licenses = %w(mit apache custom NONE)
+licenses = %w(mit apache gplv2 gplv3 custom NONE)
 on("-l LICENSE","--license",licenses,"Specify the license for your project",'(' + licenses.join('|') + ')')
 
 use_log_level_option

features/bootstrap.feature

@@ -36,8 +36,9 @@ Feature: Bootstrap a new command-line app
     And the file "tmp/newgem/.gitignore" should match /.DS_Store/
     And the file "tmp/newgem/newgem.gemspec" should match /add_development_dependency\('aruba'/
     And the file "tmp/newgem/newgem.gemspec" should match /add_development_dependency\('rdoc'/
-    And the file "tmp/newgem/newgem.gemspec" should match /add_development_dependency\('rake', '~> 0.9.2'/
+    And the file "tmp/newgem/newgem.gemspec" should match /add_development_dependency\('rake'/
     And the file "tmp/newgem/newgem.gemspec" should match /add_dependency\('methadone'/
+    And the file "tmp/newgem/newgem.gemspec" should include "test-unit" if needed
     And the file "tmp/newgem/newgem.gemspec" should use the same block variable throughout
     Given I cd to "tmp/newgem"
     And my app's name is "newgem"
@@ -50,16 +51,16 @@ Feature: Bootstrap a new command-line app
       |--log-level|
     And the banner should document that this app takes no arguments
     When I successfully run `rake -T -I../../lib`
-    Then the output should contain "rake clean         # Remove any temporary products"
-    And the output should contain "rake clobber       # Remove any generated file"
-    And the output should contain "rake clobber_rdoc  # Remove RDoc HTML files"
-    And the output should contain "rake features      # Run Cucumber features"
-    And the output should contain "rake rdoc          # Build RDoc HTML files"
-    And the output should contain "rake release       # Create tag v0.0.1 and build and push newgem-0.0.1.gem to Rubygems"
-    And the output should contain "rake rerdoc        # Rebuild RDoc HTML files"
-    And the output should contain "rake test          # Run tests"
-    And the output should match /rake install       # Build and install newgem-0.0.1.gem into system gems/
-    And the output should match /rake build         # Build newgem-0.0.1.gem into the pkg directory/
+    Then the output should match /rake clean/
+    And the output should match /rake clobber/
+    And the output should match /rake clobber_rdoc/
+    And the output should match /rake features/
+    And the output should match /rake rdoc/
+    And the output should match /rake release/
+    And the output should match /rake rerdoc/
+    And the output should match /rake test/
+    And the output should match /rake install/
+    And the output should match /rake build/
     When I run `rake -I../../../../lib`
     Then the exit status should be 0
     And the output should match /1 tests, 1 assertions, 0 failures, 0 errors/
@@ -100,22 +101,15 @@ Feature: Bootstrap a new command-line app
     And I cd to "tmp/new-gem"
     And my app's name is "new-gem"
     When I successfully run `bin/new-gem --version` with "lib" in the library path
-    Then the output should contain:
-    """
-    new-gem version 0.0.1
-    """
+    Then the output should match /new-gem version 0/
 
-    @wip
   Scenario: Version flag can be used to only show the app version with a custom format
     Given I successfully run `methadone tmp/new-gem`
     And "bin/new-gem" has configured version to show only the version with a custom format and not help
     And I cd to "tmp/new-gem"
     And my app's name is "new-gem"
     When I successfully run `bin/new-gem --version` with "lib" in the library path
-    Then the output should contain:
-    """
-    new-gem V0.0.1
-    """
+    Then the output should match /new-gem V0/
 
   Scenario: Won't squash an existing dir
     When I successfully run `methadone tmp/newgem`
@@ -166,3 +160,10 @@ Feature: Bootstrap a new command-line app
     And the banner should document that this app's arguments are:
       |app_name|which is required|
     And there should be a one line summary of what the app does
+
+  Scenario: The whole initial state of the app has been staged with git
+    Given I successfully run `methadone -l custom tmp/newgem`
+    And I cd to "tmp/newgem"
+    When I successfully run `git ls-files --others --deleted `
+    Then the output should match /\A\Z/
+

features/license.feature

@@ -11,16 +11,6 @@ Feature: Users should get the license included
     Then newgem's license should be an empty file
     And the README should reference the need for a license
 
-  Scenario Outline: Include one of a few stock licenses
-    When I successfully run `methadone -l <license> tmp/newgem`
-    Then newgem's license should be the <license> license
-    And the README should reference this license
-
-    Examples:
-      |license|
-      |apache|
-      |mit|
-
   Scenario: We only support a few licenses
     When I run `methadone -l foobar tmp/newgem`
     Then the exit status should not be 0
@@ -30,8 +20,24 @@ Feature: Users should get the license included
     When I successfully run `methadone tmp/newgem`
     Then the stderr should contain "warning: your app has no license"
     And the README should not reference a license
+    And the file "tmp/newgem/LICENSE.txt" should not exist
 
   Scenario: No license specified explicitly
     When I successfully run `methadone -l NONE tmp/newgem`
     Then the stderr should not contain "warning: your app has no license"
     And the README should not reference a license
+    And the file "tmp/newgem/LICENSE.txt" should not exist
+
+  Scenario Outline: Include one of a few stock licenses
+    When I successfully run `methadone -l <license> tmp/newgem`
+    Then newgem's license should be the <license> license
+    And the README should reference this license
+    And LICENSE.txt should contain user information and program name
+
+    Examples:
+      |license|
+      |apache|
+      |mit|
+      |gplv2|
+      |gplv3|
+

features/multilevel_commands.feature

@@ -41,7 +41,7 @@ Feature: Support multi-level commands
     And the file "tmp/multigem/.gitignore" should match /.DS_Store/
     And the file "tmp/multigem/multigem.gemspec" should match /add_development_dependency\('aruba'/
     And the file "tmp/multigem/multigem.gemspec" should match /add_development_dependency\('rdoc'/
-    And the file "tmp/multigem/multigem.gemspec" should match /add_development_dependency\('rake', '~> 0.9.2'/
+    And the file "tmp/multigem/multigem.gemspec" should match /add_development_dependency "rake", "~> 10.0"/
     And the file "tmp/multigem/multigem.gemspec" should match /add_dependency\('methadone'/
     And the file "tmp/multigem/multigem.gemspec" should use the same block variable throughout
     And the file "tmp/multigem/bin/multigem" should match /command "walk" => Multigem::Commands::Walk/

features/rspec_support.feature

@@ -17,14 +17,8 @@ Feature: Bootstrap a new command-line app using RSpec instead of Test::Unit
     And the file "tmp/newgem/newgem.gemspec" should match /add_development_dependency\('rspec'/
     When I cd to "tmp/newgem"
     And I successfully run `rake -T -I../../lib`
-    Then the output should contain:
-    """
-    rake spec          # Run RSpec code examples
-    """
-    And the output should not contain:
-    """
-    rake test          # Run tests
-    """
+    Then the output should match /rake spec/
+    And the output should not match /rake test/
     When I run `rake spec -I../../lib`
     Then the exit status should be 0
     And the output should contain:

features/step_definitions/bootstrap_steps.rb

@@ -39,3 +39,9 @@
     end
   end
 end
+
+Then /^the file "(.*?)" should include "(.*?)" if needed$/ do |file, gemname|
+  if RUBY_VERSION =~ /^2\./ && RUBY_VERSION !~ /^2.0/ && RUBY_VERSION !~ /^2.1/
+    step %{the file "#{file}" should match /add_development_dependency\\('#{gemname}/}
+  end
+end

features/step_definitions/license_steps.rb

@@ -5,6 +5,7 @@
 Then /^newgem's license should be the (\w+) license/ do |license|
   @license = license
   step %(a file named "tmp/newgem/LICENSE.txt" should exist)
+  step %(the file "tmp/newgem/newgem.gemspec" should match /#{@license}/)
 end
 
 Then /^the README should reference this license$/ do
@@ -22,3 +23,8 @@
   step %(the file "tmp/newgem/README.rdoc" should match /License:: INSERT LICENSE HERE/)
 end
 
+Then(/^LICENSE\.txt should contain user information and program name$/) do
+  step %(the file "tmp/newgem/LICENSE.txt" should match /#{`git config user.name`}/)
+  step %(the file "tmp/newgem/LICENSE.txt" should match /newgem/)
+  step %(the file "tmp/newgem/LICENSE.txt" should match /#{Time.now.year}/)
+end

lib/methadone/cli.rb

@@ -106,5 +106,19 @@ def normalize_command(cmd)
       cmd.tr('A-Z','a-z').gsub(/[^a-z0-9_]/,'_').sub(/^_*/,'')
     end
 
+    def render_license_partial(partial)
+      ERB.new(File.read(template_dir('full/'+partial))).result(binding).strip 
+    end
+
+    def gemspec
+      @gemspec || @gemspec=_get_gemspec
+    end
+    private
+    def _get_gemspec
+      files=Dir.glob("*.gemspec")
+      raise "Multiple gemspec files" if files.size>1
+      raise "No gemspec file" if files.size < 1
+      Gem::Specification::load(files.first)
+    end
   end
 end

lib/methadone/cli_logger.rb

@@ -85,13 +85,16 @@ def initialize(log_device=$stdout,error_device=$stderr)
       super(log_device)
       @stderr_logger = Logger.new(error_device)
 
-      @split_logs = log_device.tty? && error_device.tty?
+      log_device_tty   = tty?(log_device)
+      error_device_tty = tty?(error_device)
+
+      @split_logs = log_device_tty && error_device_tty
 
       self.level = Logger::Severity::INFO
       @stderr_logger.level = DEFAULT_ERROR_LEVEL
 
-      self.formatter = BLANK_FORMAT if log_device.tty?
-      @stderr_logger.formatter = BLANK_FORMAT if error_device.tty?
+      self.formatter = BLANK_FORMAT if log_device_tty
+      @stderr_logger.formatter = BLANK_FORMAT if error_device_tty
     end
 
     def level=(level)
@@ -119,5 +122,12 @@ def error_formatter=(formatter)
       @stderr_logger.formatter=formatter
     end
 
+  private
+
+    def tty?(device_or_string)
+      return device_or_string.tty? if device_or_string.respond_to? :tty?
+      false
+    end
+
   end
 end