scripting 0.1.0 → 0.1.1

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", ">= 1.0.0"
+  gem "rspec", ">= 2.5.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       rake
     rake (0.8.7)
     rcov (0.9.9)
+    rcov (0.9.9-java)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -19,9 +20,10 @@ GEM
     rspec-mocks (2.5.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   jeweler (~> 1.5.2)
   rcov
-  rspec (>= 1.0.0)
+  rspec (>= 2.5.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/scripting/app_defaults.rb

@@ -23,7 +23,8 @@ module Scripting
           end
 
           on_tail('-h', '--help', "Help text") do
-            puts self
+            STDERR.puts self
+            context.clear_work!
             terminate
           end
         end

data/lib/scripting/application.rb

@@ -8,11 +8,12 @@ module Scripting
     extend Pluggable
 
     def initialize
-      @options = Options.new
-      @switches = Parser.new(self)
-      @work = []
+      clear_switches!
+      clear_options!
+      clear_work!
     end
 
+
     def context
       self
     end
@@ -22,16 +23,28 @@ module Scripting
       self
     end
 
+    def clear_switches!
+      @switches = Parser.new(self)
+    end
+
     def switches &blk
       @switches.instance_eval &blk if block_given?
       @switches
     end
 
+    def clear_options!
+      @options = Options.new
+    end
+
     def options &blk
       @options.describe &blk if block_given?
       @options
     end
 
+    def clear_work!
+      @work = []
+    end
+
     def work &blk
       @work << blk if block_given?
       @work
@@ -71,4 +84,4 @@ module Scripting
     app.describe &blk
     app
   end
-end
+end

data/lib/scripting/parser.rb

@@ -7,7 +7,7 @@ module Scripting
   def self.CustomParser(klass)
     custom = Class.new(DelegateClass(klass))
     custom.class_eval do
-      extend(Forwardable)
+      extend Forwardable
       def_delegators :@context, :context, :options
       def describe; instance_eval; end
     end

data/scripting.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scripting}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["sdeming"]
-  s.date = %q{2011-03-06}
+  s.date = %q{2011-03-07}
   s.description = %q{Simplified command line scripting tool}
   s.email = %q{sdeming@makefile.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/scripting/parser.rb",
     "lib/scripting/pluggable.rb",
     "scripting.gemspec",
+    "spec/app_defaults_spec.rb",
     "spec/application_spec.rb",
     "spec/options_spec.rb",
     "spec/spec_helper.rb"
@@ -38,30 +39,30 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/sdeming/scripting}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Simplified command line scripting tool}
   s.test_files = [
     "examples/simple.rb",
+    "spec/app_defaults_spec.rb",
     "spec/application_spec.rb",
     "spec/options_spec.rb",
     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/spec/app_defaults_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Scripting::AppDefaults do
+
+  before :each do
+    @stdout = ''
+    STDOUT.stub(:write) { |*args| @stdout << args.join }
+
+    @stderr = ''
+    STDERR.stub(:write) { |*args| @stderr << args.join }
+  end
+
+  it "should define default options when using AppDefaults plugin" do
+    app = Scripting::create_application do
+      plugin Scripting::AppDefaults
+      uses :default_options
+    end
+    app.options.verbose.should be_false
+  end
+
+  it "should define default switches when using AppDefaults plugin" do
+    app = Scripting::create_application do
+      plugin Scripting::AppDefaults
+      uses :default_switches
+    end
+    app.options.verbose.should be_nil
+    app.parse! ["-v"]
+    app.options.verbose.should be_true
+  end
+
+  it "should define both default options and switches when using AppDefaults plugin" do
+    app1 = Scripting::create_application do
+      plugin Scripting::AppDefaults
+      uses :default_switches
+      uses :default_options
+    end
+    app1.options.verbose.should be_false
+    app1.parse! ["-v"]
+    app1.options.verbose.should be_true
+
+    app2 = Scripting::create_application do
+      plugin Scripting::AppDefaults
+      uses :default_switches, :default_options
+    end
+    app2.options.verbose.should be_false
+    app2.parse! ["-v"]
+    app2.options.verbose.should be_true
+  end
+
+  it "should terminate command line processing and clear work when -h is passed with default switches" do
+    app = Scripting::create_application do
+      plugin Scripting::AppDefaults
+      uses :default_switches, :default_options
+      work { puts 7 * 6 }
+    end
+    @stderr.should be_empty
+    app.work.should_not be_empty
+    app.parse! ["-h"]
+    @stderr.should_not be_empty
+    app.work.should be_empty
+  end
+end

data/spec/application_spec.rb

@@ -37,40 +37,4 @@ describe Scripting::Application do
     app.options.action.should == "digest"
   end
 
-  it "should define default options when using AppDefaults plugin" do
-    app = Scripting::create_application do
-      plugin Scripting::AppDefaults
-      uses :default_options
-    end
-    app.options.verbose.should be_false
-  end
-
-  it "should define default switches when using AppDefaults plugin" do
-    app = Scripting::create_application do
-      plugin Scripting::AppDefaults
-      uses :default_switches
-    end
-    app.options.verbose.should be_nil
-    app.parse! ["-v"]
-    app.options.verbose.should be_true
-  end
-
-  it "should define both default options and switches when using AppDefaults plugin" do
-    app1 = Scripting::create_application do
-      plugin Scripting::AppDefaults
-      uses :default_switches
-      uses :default_options
-    end
-    app1.options.verbose.should be_false
-    app1.parse! ["-v"]
-    app1.options.verbose.should be_true
-
-    app2 = Scripting::create_application do
-      plugin Scripting::AppDefaults
-      uses :default_switches, :default_options
-    end
-    app2.options.verbose.should be_false
-    app2.parse! ["-v"]
-    app2.options.verbose.should be_true
-  end
-end
+end

data/spec/spec_helper.rb

@@ -1 +1,8 @@
-require File.expand_path("../../lib/scripting", __FILE__)
+require 'rspec/core'
+require 'rspec/mocks'
+require 'rspec/expectations'
+
+require File.expand_path("../../lib/scripting", __FILE__)
+
+RSpec::configure do
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scripting
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - sdeming
@@ -14,52 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -05:00
+date: 2011-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
-        - 1
-        - 0
+        - 2
+        - 5
         - 0
-        version: 1.0.0
-  type: :development
+        version: 2.5.0
   prerelease: false
-  version_requirements: *id001
+  type: :development
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  type: :development
   prerelease: false
-  version_requirements: *id002
+  type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id003
+  type: :development
+  requirement: *id003
 description: Simplified command line scripting tool
 email: sdeming@makefile.com
 executables: []
@@ -84,6 +88,7 @@ files:
 - lib/scripting/parser.rb
 - lib/scripting/pluggable.rb
 - scripting.gemspec
+- spec/app_defaults_spec.rb
 - spec/application_spec.rb
 - spec/options_spec.rb
 - spec/spec_helper.rb
@@ -101,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1339519597396043880
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -110,18 +115,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Simplified command line scripting tool
 test_files: 
 - examples/simple.rb
+- spec/app_defaults_spec.rb
 - spec/application_spec.rb
 - spec/options_spec.rb
 - spec/spec_helper.rb