methadone 1.2.4 → 1.2.5

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3@methadone-dev --create
+rvm use 1.9.3-p286@methadone-dev --create

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v.1.2.5 - Feb 24, 2012
+
+* Compatibility Bundler 1.3 - Bundler 1.3 bootstraps files differently than 1.2, and methadone's generated binfile ends up requiring a non-existent file.  This verison works with both 1.2 and 1.3 of bundler by parsing its output to figure out which file to include.
+
 ## v.1.2.4 - Dec 26, 2012
 
 * Fix for my fix on apps with dashes in their name (see [59], thanks to [@terryfinn]

data/Gemfile

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

data/bin/methadone

@@ -22,7 +22,14 @@ main do |app_name|
 
   chdir File.dirname(app_name)
 
-  sh! "bundle gem #{gemname}"
+  require_file = nil
+  sh! "bundle gem #{gemname} --no-color" do |stdout|
+    require_file = stdout.split(/\n/).select { |file|
+      file =~ /\.rb$/ && file !~ /version.rb$/
+    }.first
+  end
+  require_file = gemname if require_file.nil?
+  require_file.gsub!(/^.*lib\//,'')
 
   chdir gemname
 

data/features/bootstrap.feature

@@ -52,17 +52,20 @@ Feature: Bootstrap a new command-line app
     When I successfully run `rake -T -I../../lib`
     Then the output should contain:
     """
-    rake build         # Build newgem-0.0.1.gem into the pkg directory
     rake clean         # Remove any temporary products.
     rake clobber       # Remove any generated file.
     rake clobber_rdoc  # Remove RDoc HTML files
     rake features      # Run Cucumber features
-    rake install       # Build and install newgem-0.0.1.gem into system gems
+    """
+    And the output should contain:
+    """
     rake rdoc          # Build RDoc HTML files
     rake release       # Create tag v0.0.1 and build and push newgem-0.0.1.gem to Rubygems
     rake rerdoc        # Rebuild RDoc HTML files
     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/
     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/

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.2.4" #:nodoc:
+  VERSION = "1.2.5" #:nodoc:
 end

data/methadone.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency("aruba")
   s.add_development_dependency("simplecov", "~> 0.5")
   s.add_development_dependency("clean_test")
-  s.add_development_dependency("mocha")
+  s.add_development_dependency("mocha", "0.13.2")
+  s.add_development_dependency("minitest", "4.6.1")
   s.add_development_dependency("sdoc")
   s.add_development_dependency("rspec") # needed so that rspec-bootstrapped app test can run
 end

data/templates/full/bin/executable.erb

@@ -2,7 +2,7 @@
 
 require 'optparse'
 require 'methadone'
-require '<%= gemname %>'
+require '<%= require_file %>'
 
 class App
   include Methadone::Main

data/test/execution_strategy/test_jvm.rb

@@ -1,5 +1,5 @@
 require 'base_test'
-require 'mocha'
+require 'mocha/setup'
 
 # Defined by JRuby, but this test must pass on any Ruby
 class NativeException

data/test/execution_strategy/test_open_3.rb

@@ -1,5 +1,5 @@
 require 'base_test'
-require 'mocha'
+require 'mocha/setup'
 require 'open3'
 
 module ExecutionStrategy

data/test/execution_strategy/test_open_4.rb

@@ -1,5 +1,5 @@
 require 'base_test'
-require 'mocha'
+require 'mocha/setup'
 
 # Define this symbol without requiring the library;
 # all we're goingn to do is mock calls to it

data/test/execution_strategy/test_rbx_open_4.rb

@@ -1,8 +1,8 @@
 require 'base_test'
-require 'mocha'
+require 'mocha/setup'
 
 # Define this symbol without requiring the library;
-# all we're goingn to do is mock calls to it
+# all we're going to do is mock calls to it
 module Open4
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,17 +128,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.2
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.6.1
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2310702819927979182
+      hash: 690823420417849416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -335,10 +351,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2310702819927979182
+      hash: 690823420417849416
 requirements: []
 rubyforge_project: methadone
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Kick the bash habit and start your command-line apps off right