ccp 0.1.4 → 0.1.5

data/lib/ccp/commands.rb

@@ -7,6 +7,7 @@ module Ccp
     autoload :RuntimeArgs    , 'ccp/commands/runtime_args'
     autoload :Commentable    , 'ccp/commands/commentable'
     autoload :Core           , 'ccp/commands/core'
+    autoload :Base           , 'ccp/commands/base'
     autoload :Resolvable     , 'ccp/commands/resolvable'
   end
 end

data/lib/ccp/commands/base.rb

@@ -0,0 +1,13 @@
+module Ccp
+  module Commands
+    class Base
+      include Ccp::Commands::Core
+
+      attr_reader :args
+
+      def initialize(*args)
+        @args = args
+      end
+    end
+  end
+end

data/lib/ccp/commands/composite.rb

@@ -31,7 +31,7 @@ module Ccp
 
         def append_command(klass, *args, &block)
           klass = resolve(klass)
-          if commands.find{|cc| cc.klass == klass}
+          if commands.find{|cc| cc.klass == klass and cc.args == args}
             # ignore: already added
           else
             commands << CommandClass.new(klass, args, block)

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/commands_base_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Ccp::Commands::Base do
+  describe "#initialize" do
+    it "should accept *args" do
+      lambda {
+        Ccp::Commands::Base.new
+        Ccp::Commands::Base.new(1)
+        Ccp::Commands::Base.new(:a, "str", {1=>[]})
+      }.should_not raise_error
+    end
+  end
+
+  describe "#args" do
+    it "should return args" do
+      cmd = Ccp::Commands::Base.new("data.db", :adapter=>"sqlite", :type=>"kvs")
+      cmd.args.should == ["data.db", {:adapter=>"sqlite", :type=>"kvs"}]
+    end
+  end
+end

data/spec/commands_composite_spec.rb

@@ -26,6 +26,45 @@ describe Ccp::Commands::Composite do
          "Program#after"]
     end
   end
+
+  describe ".command" do
+    ArgedCmd = Struct.new(:a,:b,:c) {
+      include Ccp::Commands::Core
+      def execute
+        data[:args] = [a,b,c]
+      end
+    }
+
+    it "should pass given args to initializer" do
+      parent = Class.new { include Ccp::Commands::Composite
+        command ArgedCmd
+      }.new
+      parent.execute
+      parent.data[:args].should == [nil,nil,nil]
+
+      parent = Class.new { include Ccp::Commands::Composite
+        command ArgedCmd, 1, "x"
+      }.new
+      parent.execute
+      parent.data[:args].should == [1, "x", nil]
+    end
+
+    it "should ignore same commands" do
+      composite = Class.new { include Ccp::Commands::Composite
+        command ArgedCmd
+        command ArgedCmd
+      }
+      composite.commands.size.should == 1
+    end
+
+    it "should distinct command's args" do
+      composite = Class.new { include Ccp::Commands::Composite
+        command ArgedCmd
+        command ArgedCmd, 1
+      }
+      composite.commands.size.should == 2
+    end
+  end
 end
 
 describe "Ccp::Commands::Composite(nested)" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-14 00:00:00 +09:00
+date: 2012-03-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - lib/ccp.rb
 - lib/ccp/colorize.rb
 - lib/ccp/commands.rb
+- lib/ccp/commands/base.rb
 - lib/ccp/commands/command_not_found.rb
 - lib/ccp/commands/commentable.rb
 - lib/ccp/commands/composite.rb
@@ -99,6 +100,7 @@ files:
 - lib/ccp/receivers/none.rb
 - lib/ccp/receivers/profileable.rb
 - lib/ccp/version.rb
+- spec/commands_base_spec.rb
 - spec/commands_composite_spec.rb
 - spec/commands_core_spec.rb
 - spec/data_spec.rb