scripting 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/simple.rb

@@ -2,8 +2,6 @@ require File.expand_path('../../lib/scripting', __FILE__)
 
 MyApp = Scripting::create_application do
   plugin Scripting::AppDefaults
-  uses :default_switches
-  uses :default_options
 
   options do
     message { "Hello World" }

data/lib/scripting/app_defaults.rb

@@ -1,27 +1,22 @@
 module Scripting
   module AppDefaults
 
-    def self.included(base)
-      base.class_eval do
-        plugins :default_switches, :default_options
-      end
-    end
-
-    def default_options(context)
-      context.describe do
+    def self.instance_init(instance, *args)
+      instance.instance_eval do
         options do
           verbose false
+          debug false
         end
-      end
-    end
 
-    def default_switches(context)
-      context.describe do
         switches do
           on_tail('-v', '--verbose', 'Enable verbose output') do
             options.verbose = true
           end
 
+          on_tail('-D', '--debug', 'Enable debug output') do
+            options.debug = true
+          end
+
           on_tail('-h', '--help', "Help text") do
             STDERR.puts self
             context.clear_work!

data/lib/scripting/application.rb

@@ -13,7 +13,6 @@ module Scripting
       clear_work!
     end
 
-
     def context
       self
     end
@@ -50,21 +49,6 @@ module Scripting
       @work
     end
 
-    def plugin module_name
-      self.class.send(:include, module_name)
-    end
-
-    def uses *names
-      names.each do |name|
-        name = name.to_sym
-        if installed_plugins.include? name
-          send(name, self)
-        else
-          raise "unknown method '#{name.inspect}' provided in uses"
-        end
-      end
-    end
-
     def parse! args
       switches.parse! args
       args
@@ -80,7 +64,7 @@ module Scripting
   end
 
   def self.create_application &blk
-    app = Application.new
+    app = Class.new(Application).new
     app.describe &blk
     app
   end

data/lib/scripting/options.rb

@@ -21,7 +21,7 @@ module Scripting
 
     def method_missing(name, value = nil, &blk)
       name = name.to_s
-      name = name[0..-2] if name =~ /=$/
+      name.chop! if name =~ /=$/
 
       if block_given?
         self[name] = blk

data/lib/scripting/pluggable.rb

@@ -1,35 +1,40 @@
 module Scripting
   module Pluggable
     module ClassMethods
-      def meta
-        (class << self; self; end)
+      def plugins
+        @__plugins__ ||= []
       end
 
-      def plugin name
-        plugins = self.meta.instance_variable_get("@__plugins__")
-        plugins << name
-        self.meta.instance_variable_set("@__plugins__", plugins)
-      end
-
-      def plugins *names
-        names.each { |name| self.plugin(name) }
-        self.meta.instance_variable_get("@__plugins__")
-      end
+      def plugin mod, *args
+        current = self.plugins
+        unless current.include? mod
+          current << mod
+          include(mod::InstanceMethods) if mod.const_defined? "InstanceMethods"
+          extend(mod::ClassMethods) if mod.const_defined? "ClassMethods"
 
-      def self.extended(base)
-        base.meta.instance_variable_set("@__plugins__", [])
+          if mod.respond_to? :class_init
+            mod.class_init(self, *args)
+          end
+        end
       end
     end
 
     module InstanceMethods
-      def installed_plugins
+      def plugins
         self.class.plugins
       end
+
+      def plugin mod, *args
+        self.class.plugin mod, *args
+        if mod.respond_to? :instance_init
+          mod.instance_init(self, *args)
+        end
+      end
     end
 
     def self.extended(base)
-      base.send(:extend, ClassMethods)
       base.send(:include, InstanceMethods)
+      base.send(:extend, ClassMethods)
     end
   end
 end

data/scripting.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scripting}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["sdeming"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-09}
   s.description = %q{Simplified command line scripting tool}
   s.email = %q{sdeming@makefile.com}
   s.extra_rdoc_files = [
@@ -34,22 +34,25 @@ Gem::Specification.new do |s|
     "spec/app_defaults_spec.rb",
     "spec/application_spec.rb",
     "spec/options_spec.rb",
+    "spec/pluggable_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/sdeming/scripting}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.3.7}
   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/pluggable_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

data/spec/app_defaults_spec.rb

@@ -10,47 +10,20 @@ describe Scripting::AppDefaults do
     STDERR.stub(:write) { |*args| @stderr << args.join }
   end
 
-  it "should define default options when using AppDefaults plugin" do
+  it "should define default options and switches 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.debug.should be_false
+    app.parse! ["-vD"]
     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
+    app.options.debug.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

data/spec/pluggable_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe Scripting::Pluggable do
+  it "should apply both ClassMethods and InstanceMethods" do
+    module PluginA
+      module ClassMethods
+        def my_method; :class_method_result; end
+      end
+      module InstanceMethods
+        def my_method; :instance_method_result; end
+      end
+    end
+
+    exemplar = Scripting::Application.new
+    exemplar.plugins.should be_empty
+    lambda { exemplar.class.my_method }.should raise_error(NoMethodError)
+    lambda { exemplar.my_method }.should raise_error(NoMethodError)
+
+    with_plugin = Scripting::create_application do
+      plugin PluginA
+    end
+    with_plugin.plugins.should == [PluginA]
+    with_plugin.class.my_method.should == :class_method_result
+    with_plugin.my_method.should == :instance_method_result
+
+    without_plugin = Scripting::create_application do
+    end
+    without_plugin.plugins.should be_empty
+    lambda { without_plugin.class.my_method }.should raise_error(NoMethodError)
+    lambda { without_plugin.my_method }.should raise_error(NoMethodError)
+  end
+
+  it "should apply only ClassMethods if InstanceMethods are undeclared" do
+    module PluginB
+      module ClassMethods
+        def my_method; :class_method_result; end
+      end
+    end
+
+    app = Scripting::create_application do
+      plugin PluginB
+    end
+    app.plugins.should == [PluginB]
+    app.class.my_method.should == :class_method_result
+    lambda { app.my_method }.should raise_error(NoMethodError)
+  end
+
+  it "should apply only InstanceMethods if ClassMethods are undeclared" do
+    module PluginC
+      module InstanceMethods
+        def my_method; :instance_method_result; end
+      end
+    end
+
+    app = Scripting::create_application do
+      plugin PluginC
+    end
+    app.plugins.should == [PluginC]
+    lambda { app.class.my_method }.should raise_error(NoMethodError)
+    app.my_method.should == :instance_method_result
+  end
+
+  it "should run class_init and instance_init of they are declared" do
+    module PluginD
+      def self.class_init(base, *args)
+        base.class_eval do
+          def self.foo; 0xdeadbeef; end
+        end
+      end
+
+      def self.instance_init(instance, *args)
+        instance.instance_eval do
+          def foo; 0x8ba11; end
+        end
+      end
+    end
+
+    app = Scripting::create_application do
+      plugin PluginD
+    end
+
+    app.plugins.should == [PluginD]
+    app.class.foo.should == 0xdeadbeef
+    app.foo.should == 0x8ba11
+  end
+
+  it "should allow multiple plugins" do
+    module PluginE
+    end
+
+    module PluginF
+    end
+
+    app = Scripting::create_application do
+      plugin PluginE
+      plugin PluginF
+    end
+
+    app.plugins.should == [PluginE, PluginF]
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: scripting
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - sdeming
@@ -15,55 +14,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 2
         - 5
         - 0
         version: 2.5.0
-  prerelease: false
   type: :development
-  requirement: *id001
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  prerelease: false
   type: :development
-  requirement: *id002
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: *id003
 description: Simplified command line scripting tool
 email: sdeming@makefile.com
 executables: []
@@ -91,6 +87,7 @@ files:
 - spec/app_defaults_spec.rb
 - spec/application_spec.rb
 - spec/options_spec.rb
+- spec/pluggable_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sdeming/scripting
@@ -106,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4157022527390188045
       segments: 
       - 0
       version: "0"
@@ -115,14 +112,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simplified command line scripting tool
@@ -131,4 +127,5 @@ test_files:
 - spec/app_defaults_spec.rb
 - spec/application_spec.rb
 - spec/options_spec.rb
+- spec/pluggable_spec.rb
 - spec/spec_helper.rb