methadone 1.2.1 → 1.2.2

data/.travis.yml

@@ -2,11 +2,10 @@ notifications:
   email:
     on_success: always
 script: 'bundle exec rake'
-rvm: 
+rvm:
   - 1.9.2
   - 1.9.3
   - 1.8.7
   - ree
-  - ruby-head
   - rbx
   - jruby

data/CHANGES.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v1.2.3 - Oct 21, 2012
+
+* Generated Rakefile has better formatted code (See [57])
+* Error output preface now says "stderr is" instead of "error output", which is less confusing (See [53])
+
+  [57]: http://github.com/davetron5000/methadone/issues/57
+  [53]: http://github.com/davetron5000/methadone/issues/53
+
+## v1.2.2 - Oct 2, 2012
+
+* Less scary stdout/stderr prefixing from SH, courtesy @yoni
+
 ## v1.2.1 - Jun 10, 2012, 3:41 PM
 
 * Slightly loosen what passes for a one-line description of the app, courtesy @jredville

data/README.rdoc

@@ -4,6 +4,8 @@ Author::  Dave Copeland (mailto:davetron5000 at g mail dot com)
 Copyright:: Copyright (c) 2011 by Dave Copeland
 License:: Distributes under the Apache License, see LICENSE.txt in the source distro
 
+{<img src="https://secure.travis-ci.org/davetron5000/methadone.png" alt="Build Status" />}[http://travis-ci.org/davetron5000/methadone]
+
 A smattering of tools to make your command-line apps easily awesome; kick the bash habit without sacrificing any of the power.
 
 The goal of this project is to make it as easy as possible to write awesome and powerful command-line applications.

data/bin/methadone

@@ -59,8 +59,8 @@ main do |app_name|
   add_to_file "#{gemname}.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_dependency('methadone', '~>#{Methadone::VERSION}')",
+    "  #{gem_variable}.add_development_dependency('rake', '~> 0.9.2')",
+    "  #{gem_variable}.add_dependency('methadone', '~> #{Methadone::VERSION}')",
   ], :before => /^end\s*$/
 end
 

data/features/bootstrap.feature

@@ -35,7 +35,7 @@ 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', '~> 0.9.2'/
     And the file "tmp/newgem/newgem.gemspec" should match /add_dependency\('methadone'/
     And the file "tmp/newgem/newgem.gemspec" should use the same block variable throughout
     Given I cd to "tmp/newgem"

data/features/rspec_support.feature

@@ -6,6 +6,7 @@ Feature: Bootstrap a new command-line app using RSpec instead of Test::Unit
   Background:
     Given the directory "tmp/newgem" does not exist
 
+    @announce
   Scenario: Bootstrap a new app from scratch
     When I successfully run `methadone --rspec tmp/newgem`
     Then the following directories should exist:

data/lib/methadone/sh.rb

@@ -103,13 +103,13 @@ module Methadone
       stdout,stderr,status = execution_strategy.run_command(command)
       process_status = Methadone::ProcessStatus.new(status,options[:expected])
 
-      sh_logger.warn("Error output of '#{command}': #{stderr}") unless stderr.strip.length == 0
+      sh_logger.warn("stderr output of '#{command}': #{stderr}") unless stderr.strip.length == 0
 
       if process_status.success?
-        sh_logger.debug("Output of '#{command}': #{stdout}") unless stdout.strip.length == 0
+        sh_logger.debug("stdout output of '#{command}': #{stdout}") unless stdout.strip.length == 0
         call_block(block,stdout,stderr,process_status.exitstatus) unless block.nil?
       else
-        sh_logger.info("Output of '#{command}': #{stdout}") unless stdout.strip.length == 0
+        sh_logger.info("stdout output of '#{command}': #{stdout}") unless stdout.strip.length == 0
         sh_logger.warn("Error running '#{command}'")
       end
 

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.2.1" #:nodoc:
+  VERSION = "1.2.2" #:nodoc:
 end

data/methadone.gemspec

@@ -29,13 +29,13 @@ gem install open4
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_dependency("bundler")
-  s.add_development_dependency("rspec-expectations", "~> 2.6")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc","~> 3.9")
-  s.add_development_dependency("cucumber","~> 1.1.1")
+  s.add_development_dependency("cucumber")
   s.add_development_dependency("aruba")
   s.add_development_dependency("simplecov", "~> 0.5")
-  s.add_development_dependency("clean_test", "~> 0.10")
+  s.add_development_dependency("clean_test")
   s.add_development_dependency("mocha")
   s.add_development_dependency("sdoc")
+  s.add_development_dependency("rspec") # needed so that rspec-bootstrapped app test can run
 end

data/templates/full/Rakefile.erb

@@ -1,7 +1,37 @@
+def dump_load_path
+  puts $LOAD_PATH.join("\n")
+  found = nil
+  $LOAD_PATH.each do |path|
+    if File.exists?(File.join(path,"rspec"))
+      puts "Found rspec in #{path}"
+      if File.exists?(File.join(path,"rspec","core"))
+        puts "Found core"
+        if File.exists?(File.join(path,"rspec","core","rake_task"))
+          puts "Found rake_task"
+          found = path
+        else
+          puts "!! no rake_task"
+        end
+      else
+        puts "!!! no core"
+      end
+    end
+  end
+  if found.nil?
+    puts "Didn't find rspec/core/rake_task anywhere"
+  else
+    puts "Found in #{path}"
+  end
+end
 require 'bundler'
 require 'rake/clean'
 <% if rspec %>
+begin
 require 'rspec/core/rake_task'
+rescue LoadError
+dump_load_path
+raise
+end
 <% else %>
 require 'rake/testtask'
 <% end %>

data/test/base_test.rb

@@ -5,6 +5,7 @@ end
 require 'test/unit'
 require 'rspec/expectations'
 require 'clean_test/test_case'
+require 'ostruct'
 
 class BaseTest < Clean::Test::TestCase
 end

data/test/command_for_tests.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "standard output"
+if [ $# -gt 0 ]; then
+  echo "standard error" 1>&2
+fi
+exit $#

data/test/test_cli_logging.rb

@@ -4,7 +4,7 @@ require 'stringio'
 
 class TestCLILogging < BaseTest
   include Methadone
-  
+
   def setup
     @blank_format = proc do |severity,datetime,progname,msg|
       msg + "\n"

data/test/test_main.rb

@@ -634,7 +634,7 @@ class TestMain < BaseTest
       @flag_value = any_string
       rc_file = File.join(ENV['HOME'],'.my_app.rc')
       File.open(rc_file,'w') do |file|
-        file.puts ({
+        file.puts({
           'switch' => true,
           'flag' => @flag_value,
         }.to_yaml)

data/test/test_sh.rb

@@ -1,5 +1,5 @@
-require 'test/unit'
-require 'clean_test/test_case'
+require 'base_test'
+require 'methadone'
 
 class TestSH < Clean::Test::TestCase
   include Methadone::SH
@@ -19,7 +19,11 @@ class TestSH < Clean::Test::TestCase
     def debug(msg); @debugs << msg; end
     def info(msg); @infos << msg; end
     def warn(msg); @warns << msg; end
-    def error(msg); @errors << msg; end
+    def error(msg)
+      # Try to figure out what's going on on Travis
+      STDERR.puts msg if RUBY_PLATFORM == 'java'
+      @errors << msg
+    end
     def fatal(msg); @fatals << msg; end
 
   end
@@ -188,8 +192,8 @@ class TestSH < Clean::Test::TestCase
           @block_called.should == true
           @exitstatus_received.should == 1
           @logger.debugs[0].should == "Executing '#{test_command}foo'"
-          @logger.debugs[1].should == "Output of '#{test_command}foo': #{test_command_stdout}"
-          @logger.warns[0].should == "Error output of '#{test_command}foo': #{test_command_stderr}"
+          @logger.debugs[1].should == "stdout output of '#{test_command}foo': #{test_command_stdout}"
+          @logger.warns[0].should == "stderr output of '#{test_command}foo': #{test_command_stderr}"
         }
       end
     end
@@ -360,14 +364,14 @@ private
   def assert_successful_command_execution(exit_code,logger,command,stdout)
     exit_code.should == 0
     logger.debugs[0].should == "Executing '#{command}'"
-    logger.debugs[1].should == "Output of '#{command}': #{stdout}"
+    logger.debugs[1].should == "stdout output of '#{command}': #{stdout}"
     logger.warns.length.should == 0
   end
 
   def assert_logger_output_for_failure(logger,command,stdout,stderr)
     logger.debugs[0].should == "Executing '#{command}'"
-    logger.infos[0].should == "Output of '#{command}': #{stdout}"
-    logger.warns[0].should == "Error output of '#{command}': #{stderr}"
+    logger.infos[0].should == "stdout output of '#{command}': #{stdout}"
+    logger.warns[0].should == "stderr output of '#{command}': #{stderr}"
     logger.warns[1].should == "Error running '#{command}'"
   end
 
@@ -378,7 +382,7 @@ private
 
   # Runs the test command which exits with the length of ARGV/args
   def test_command(args='')
-    File.join(File.dirname(__FILE__),'command_for_tests.rb') + ' ' + args
+    File.join(File.expand_path(File.dirname(__FILE__)),'command_for_tests.sh') + ' ' + args
   end
 
   def test_command_stdout; "standard output"; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -128,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Methadone provides a lot of small but useful features for developing
   a command-line app, including an opinionated bootstrapping process, some helpful
   cucumber steps, and some classes to bridge logging and output into a simple, unified,
@@ -289,7 +289,7 @@ files:
 - !binary |-
   dGVzdC9iYXNlX3Rlc3QucmI=
 - !binary |-
-  dGVzdC9jb21tYW5kX2Zvcl90ZXN0cy5yYg==
+  dGVzdC9jb21tYW5kX2Zvcl90ZXN0cy5zaA==
 - !binary |-
   dGVzdC9leGVjdXRpb25fc3RyYXRlZ3kvdGVzdF9iYXNlLnJi
 - !binary |-
@@ -361,7 +361,7 @@ test_files:
 - !binary |-
   dGVzdC9iYXNlX3Rlc3QucmI=
 - !binary |-
-  dGVzdC9jb21tYW5kX2Zvcl90ZXN0cy5yYg==
+  dGVzdC9jb21tYW5kX2Zvcl90ZXN0cy5zaA==
 - !binary |-
   dGVzdC9leGVjdXRpb25fc3RyYXRlZ3kvdGVzdF9iYXNlLnJi
 - !binary |-

data/test/command_for_tests.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-STDOUT.puts "standard output"
-STDERR.puts "standard error" if ARGV.length > 0
-exit ARGV.length