methadone 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 008f48e3c8144f9e35daf0cc65aa87422aab06f1
-  data.tar.gz: 92e6a622617ba85211f43a7929d12fcc0bd955da
+  metadata.gz: 62d6b61845648eb9ef67b68270c29d36a36b75c3
+  data.tar.gz: 93950790b307186c6dca1bd70978e80ac53135a1
 SHA512:
-  metadata.gz: e9d00c07ea7713755a356ab7b32205b5bc574121c2cf7eca0e6f314954915cf7df094f7ea699d449bcb12b73789036bbad34fdd4c088a2c5314d078eaf119115
-  data.tar.gz: a295e7e1605a7eac0214480e824542db858e5b7f3bf6068d5da8fbd52a56d7b07320ead71acd6636ad805fff849b05895c56a29824a6c762e0034367d90e4ff6
+  metadata.gz: a80f01dde40c877f514314d07ded91187d7b9e2ee8c913f1bbdf918b0fc96303a18930e33e513ce3c1b7d2e07f4cb344ef5561a515c89ff6e9825a6b87fdc5b5
+  data.tar.gz: 9395294305318487bc0f653afbcefab6f184e77654c7a92d3db020508c7c37aac8f085fc2c43bb17de722b69252333d6e8cf64d1e9b9a0815c35183664112621

data/features/license.feature

@@ -29,6 +29,7 @@ Feature: Users should get the license included
 
     Examples:
       |license|
+      |apache|
       |mit|
       |gplv2|
       |gplv3|

data/lib/methadone/cucumber.rb

@@ -108,7 +108,7 @@ end
 
 Then /^there should be a one line summary of what the app does$/ do
   output_lines = all_output.split(/\n/)
-  output_lines.should have_at_least(3).items
+  output_lines.size.should >= 3
   # [0] is our banner, which we've checked for
   output_lines[1].should match(/^\s*$/)
   output_lines[2].should match(/^\w+\s+\w+/)

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.5.0" #:nodoc:
+  VERSION = "1.5.1" #:nodoc:
 end

data/methadone.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("simplecov", "~> 0.5")
   s.add_development_dependency("clean_test")
   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", "~> 2.99") # needed so that rspec-bootstrapped app test can run
+  s.add_development_dependency("rspec", "~> 3.0.0")
 end

data/templates/full/apache_LICENSE.txt.erb

@@ -187,7 +187,8 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-      Copyright <%= Time.now.year %> <%=`git config.user` %>
+      Name: <%= gemspec.name %><%#TODO: Get program name more efficiently  -%>
+      Copyright <%= Time.now.year %> <%=`git config user.name` %>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 describe "TestSomething" do
   it "should be true" do
-    true.should be_true
+    true.should == true
   end
 end

data/test/base_test.rb

@@ -1,11 +1,19 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter "/test"
+if RUBY_PLATFORM == 'java'
+  puts "Simplecov seems to cause JRuby to barf, so use another ruby if you want to check coverage"
+else
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/test"
+  end
 end
+
 require 'test/unit'
 require 'rspec/expectations'
 require 'clean_test/test_case'
 require 'ostruct'
 
+RSpec::Matchers.configuration.syntax = :should
+
 class BaseTest < Clean::Test::TestCase
+  include RSpec::Matchers
 end

data/test/test_sh.rb

@@ -1,7 +1,7 @@
 require 'base_test'
 require 'methadone'
 
-class TestSH < Clean::Test::TestCase
+class TestSH < BaseTest
   include Methadone::SH
   include Methadone::CLILogging
 
@@ -143,7 +143,7 @@ class TestSH < Clean::Test::TestCase
       use_capturing_logger
       @command = test_command("foo")
       @block_called = false
-    } 
+    }
     When {
       @exit_code = sh @command do
         @block_called = true
@@ -160,7 +160,7 @@ class TestSH < Clean::Test::TestCase
       use_capturing_logger
       @command = test_command("foo")
       @block_called = false
-    } 
+    }
     When {
       @exit_code = sh @command, :expected => [2] do
         @block_called = true
@@ -180,7 +180,7 @@ class TestSH < Clean::Test::TestCase
           @command = test_command("foo")
           @block_called = false
           @exitstatus_received = nil
-        } 
+        }
         When {
           @exit_code = self.send(method,@command,:expected => expected) do |_,_,exitstatus|
             @block_called = true
@@ -242,7 +242,7 @@ class TestSH < Clean::Test::TestCase
     }
   end
 
-  test_that "sh! runs a command that will fail and includes an error message that appears in the exception" do 
+  test_that "sh! runs a command that will fail and includes an error message that appears in the exception" do
     Given {
       use_capturing_logger
       @command = test_command("foo")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - davetron5000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.13.2
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.6.1
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.0.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,
@@ -188,7 +174,6 @@ files:
 - features/bootstrap.feature
 - features/license.feature
 - features/readme.feature
-- features/rspec_2.99.0_version_test.feature
 - features/rspec_support.feature
 - features/step_definitions/bootstrap_steps.rb
 - features/step_definitions/license_steps.rb
@@ -270,7 +255,6 @@ test_files:
 - features/bootstrap.feature
 - features/license.feature
 - features/readme.feature
-- features/rspec_2.99.0_version_test.feature
 - features/rspec_support.feature
 - features/step_definitions/bootstrap_steps.rb
 - features/step_definitions/license_steps.rb

data/features/rspec_2.99.0_version_test.feature

@@ -1,8 +0,0 @@
-Feature: As a User I want to use Rspec 
-  In order to use methadone
-  As a User 
-  I want to have rspec 2.99
-
-  Scenario: Rspec version test
-    When I run `rspec --version`
-    Then the output should contain exactly "2.99.1\n"