methadone 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea5a066a8f38016a6a0a185bae7a5f57e4d686cf
-  data.tar.gz: 690d8cfdc514e92027804e18cb5836e46e820b3c
+  metadata.gz: 6c7559354813dab091f2c25f43560370969f2163
+  data.tar.gz: c8132add31dd35726456c3d8a7f106ee3a24094b
 SHA512:
-  metadata.gz: c75f27bba82d19ea8990d0293d4a2cc40c9e39e1447b97f4f4d3a3329c6ef2df897e2179b2ac94937f2ecf07f19daa874ac09601efe9c0044ee2f1b388e589f8
-  data.tar.gz: f85d5d1f8c0ae99125a4a1175ef65ae1931be39e66ee4b1f5e06e1b38e9b3c9543c061b7573e7d70c0c096ce0ac635b78b6aa8ad1cca189b5e26a9c4a1d5ae4b
+  metadata.gz: c84eb26cc989c627f34da9dacdaf2e30766da33c530fb965dc17cc9530ad320b2cf79fb65dc45c3fac8ecde37c2af452684ab47c8892707b453853d27e876535
+  data.tar.gz: 79a67df9a6531b7a00a3b84a1560bcd46ea8869b5c69799a457f42e12d88397d3c2423a0ea3f1570651d8359963a38ed05540f8c916ffc1c5c91a00b78f6d4ed

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.2

data/.travis.yml

@@ -3,10 +3,9 @@ notifications:
     on_success: always
 script: 'bundle exec rake'
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
-  - jruby-18mode
+  - 2.2.2
   - jruby-19mode

data/bin/methadone

@@ -66,7 +66,11 @@ main do |app_name|
 
   #Ensure the gemspec file mentions the correct license
   gemspec_content = File.read(gemspec)
-  gemspec_content.gsub!(/(^\s*#{gem_variable}\.license\s*=\s*).*/,"\\1#{license.to_s.inspect}")
+  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 }
 
 
@@ -82,10 +86,17 @@ main do |app_name|
     "  #{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', '~> 2.99')",
+    "  #{gem_variable}.add_development_dependency('rspec', '~> 3')",
     ], :before => /^end\s*$/
   end
 

data/features/bootstrap.feature

@@ -7,6 +7,7 @@ Feature: Bootstrap a new command-line app
     Given the directory "tmp/newgem" does not exist
     And the directory "tmp/new-gem" does not exist
 
+    @wip
   Scenario: Bootstrap a new app from scratch
     When I successfully run `methadone tmp/newgem`
     Then the following directories should exist:
@@ -38,6 +39,7 @@ Feature: Bootstrap a new command-line app
     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'/
     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"
@@ -51,15 +53,15 @@ Feature: Bootstrap a new command-line app
     And the banner should document that this app takes no arguments
     When I successfully run `rake -T -I../../lib`
     Then the output should match /rake clean/
-    Then the output should match /rake clobber/
-    Then the output should match /rake clobber_rdoc/
-    Then the output should match /rake features/
-    Then the output should match /rake rdoc/
-    Then the output should match /rake release/
-    Then the output should match /rake rerdoc/
-    Then the output should match /rake test/
-    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/
+    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,10 +102,7 @@ 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/
 
   Scenario: Version flag can be used to only show the app version with a custom format
     Given I successfully run `methadone tmp/new-gem`
@@ -111,10 +110,7 @@ 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 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`

data/features/rspec_support.feature

@@ -14,17 +14,11 @@ Feature: Bootstrap a new command-line app using RSpec instead of Test::Unit
       |tmp/newgem/test                      |
     And the following files should exist:
       |tmp/newgem/spec/something_spec.rb                 |
-    And the file "tmp/newgem/newgem.gemspec" should match /add_development_dependency\('rspec', '~> 2.99'/
+    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:

data/features/step_definitions/bootstrap_steps.rb

@@ -39,3 +39,9 @@ Given /^"(.*?)" has configured version to show only the version (.*)and not help
     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

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.9.0" #:nodoc:
+  VERSION = "1.9.1" #:nodoc:
 end

data/methadone.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("clean_test")
   s.add_development_dependency("mocha", "0.13.2")
   s.add_development_dependency("sdoc")
-  s.add_development_dependency("rspec", "~> 3.0.0")
+  s.add_development_dependency("rspec", "~> 3")
   s.add_development_dependency("i18n", "= 0.6.1")
 end

data/templates/rspec/spec/something_spec.rb.erb

@@ -1,5 +1,5 @@
 describe "TestSomething" do
   it "should be true" do
-    true.should == true
+    expect(true).to eq(true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - davetron5000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: methadone
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Kick the bash habit and start your command-line apps off right