scripting 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/scripting/commands.rb

@@ -4,7 +4,8 @@ module Scripting
     class Command
       attr_reader :name
 
-      def initialize name
+      def initialize app, name
+        @app = app
         @name = name.to_s.downcase.to_sym
         @description = nil
         @work = lambda {} # noop by default
@@ -28,7 +29,7 @@ module Scripting
       end
 
       def run! *args
-        @work.call(*args)
+        @app.instance_exec(*args, &work)
       end
     end
 
@@ -48,21 +49,25 @@ module Scripting
 
         work do |*args|
           name = args.shift.downcase.to_sym rescue nil
-          command = options.commands[name]
-          if command.nil?
-            help!
-            puts "\nCommand: #{name} is not known"
-            exit
-          end
-
-          command.run! *args
+          run_command! name, *args
         end
       end
     end
 
     module InstanceMethods
       def command name, &blk
-        options.commands[name] = Command.new(name).describe(&blk)
+        options.commands[name] = Command.new(self, name).describe(&blk)
+      end
+
+      def run_command! name, *args
+        command = options.commands[name]
+        if command.nil?
+          help!
+          $stderr.puts "\n\nCommand: #{name} is not known"
+          exit
+        end
+
+        command.run! *args
       end
     end
   end

data/scripting.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scripting}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["sdeming"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-05-19}
   s.description = %q{Simplified command line scripting tool}
   s.email = %q{sdeming@makefile.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ 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.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Simplified command line scripting tool}
   s.test_files = [
     "examples/command.rb",

data/spec/commands_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Scripting::Commands do
   it "should symbolize and downcase the command name" do
-    Scripting::Commands::Command.new(:testing).name.should == :testing
-    Scripting::Commands::Command.new(:Testing).name.should == :testing
-    Scripting::Commands::Command.new('testing').name.should == :testing
-    Scripting::Commands::Command.new("Testing").name.should == :testing
-    Scripting::Commands::Command.new("TESTING").name.should == :testing
+    Scripting::Commands::Command.new(nil, :testing).name.should == :testing
+    Scripting::Commands::Command.new(nil, :Testing).name.should == :testing
+    Scripting::Commands::Command.new(nil, 'testing').name.should == :testing
+    Scripting::Commands::Command.new(nil, "Testing").name.should == :testing
+    Scripting::Commands::Command.new(nil, "TESTING").name.should == :testing
   end
 end
 
@@ -21,6 +21,9 @@ describe Scripting::Commands::Command do
     @app = Scripting::create_application do
       plugin Scripting::Commands
 
+      def some_method; :some_method_return_value; end
+      options { some_option :some_option }
+      
       command :answer do
         description "The answer to life, the universe, and everything"
         work { puts 42 }
@@ -35,6 +38,21 @@ describe Scripting::Commands::Command do
         description "Add two numbers"
         work { |a,b| puts a.to_f + b.to_f }
       end
+
+      command :context do
+        description "Print self.inspect"
+        work { print self.object_id }
+      end
+
+      command :call_some_method do
+        description "Call the some_method method"
+        work { print some_method.to_s }
+      end
+
+      command :print_some_option do
+        description "Print some_option value"
+        work { print options.some_option.to_s }
+      end
     end
   end
 
@@ -61,4 +79,18 @@ describe Scripting::Commands::Command do
     @stdout.should == "to infinity and beyond!\nHello world!\n"
   end
 
+  it "should run in the context of the application" do
+    @app.run! 'context'
+    @stdout.should == @app.object_id.to_s
+  end
+
+  it "should call local application methods directly" do
+    @app.run! 'call_some_method'
+    @stdout.should == @app.some_method.to_s
+  end
+
+  it "should have direct access to options" do
+    @app.run! 'print_some_option'
+    @stdout.should == @app.options.some_option.to_s
+  end
 end

metadata

@@ -1,61 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scripting
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - sdeming
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-05-19 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &24480720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24480720
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &24480220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *24480220
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &24479700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *24479700
 description: Simplified command line scripting tool
 email: sdeming@makefile.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -80,36 +77,34 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sdeming/scripting
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4148192804319844985
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2683478235931159130
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simplified command line scripting tool
-test_files: 
+test_files:
 - examples/command.rb
 - examples/simple.rb
 - spec/app_defaults_spec.rb