champu 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,2 +0,0 @@
-== Champu
-

data/lib/champu.rb

@@ -16,7 +16,7 @@ class Champu
     @config ||= Champu::Config
   end
   def step(title)
-    temp_step= Champu::Step.new(config,title)
+    temp_step= Champu::Step.new(title)
     yield(temp_step)
     temp_step
   end

data/lib/champu/step.rb

@@ -10,38 +10,53 @@ require 'champu/monkeypatches/knife_ssh'
 class Champu
   class Step
 
-    attr_reader :title,:config
-    def nodes
-      @nodes
-    end
-    
-    def initialize(config,title)
+    attr_reader :title
+
+    def initialize(title)
       @title=title
-      @config=config
       Chef::Config[:color]=true
+      @config={}
     end
+
     def ui
       @ui ||= Chef::Knife::UI.new(STDOUT,STDERR,STDIN,Champu::Config)
     end
+
+    def nodes
+      @nodes
+    end
+
+    def config(opts={})
+      @config.merge!(opts) unless opts.empty?
+      @config
+    end
+  
+    def config_value(key)
+      @config.key?(key) ? @config[key] : Champu::Config[key]
+    end
+
     def search(term)
-      Chef::Config[:knife][:ssh_attribute] = Champu::Config[:ssh_attribute]
-      Chef::Config[:knife][:ssh_user]=Champu::Config[:ssh_user]
+      Chef::Config[:knife][:ssh_attribute] = config_value(:ssh_attribute)
+      Chef::Config[:knife][:ssh_user]= config_value :ssh_user
       @nodes=Chef::Search::Query.new.search(:node,term).first
     end
+
     def execute(command)
+      Chef::Config[:knife][:ssh_attribute] = config_value :ssh_attribute
+      Chef::Config[:knife][:ssh_user]= config_value :ssh_user
       ui.msg(ui.color("Executing command:",:magenta) + ui.color(command,:yellow))
       c=Chef::Knife::Ssh.new
       c.configure_attribute
       c.configure_user
       c.configure_identity_file
-      c.config[:attribute]="ec2.public_ipv4"
+      c.config[:attribute]= config_value :ssh_attribute
       c.action_nodes(nodes)
 
       longest=0
       nodes.collect{|n|c.format_for_display(n)[c.config[:attribute]]}.each do |item|
-        hostspec = "ec2-user@#{item}"
+        hostspec = "#{config_value(:ssh_user)}@#{item}"
         session_opts = {}
-        session_opts[:keys] = Champu::Config[:identity_file]
+        session_opts[:keys] = config_value :identity_file
         session_opts[:keys_only] = true 
         session_opts[:logger] = Chef::Log.logger 
         session_opts[:paranoid] = false

data/lib/champu/version.rb

@@ -1,3 +1,3 @@
 class Champu
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/champu/champu_spec.rb

@@ -35,13 +35,19 @@ describe Champu do
     end
     it "should allow user to execute a command for a step" do
       q=double('query')
-      q.stub(:search).with(:node,"some criteria").and_return([Array.new])
+      q.stub(:search).with(:node,"some criteria").and_return([Chef::Node.new])
       Chef::Search::Query.stub(:new).with(no_args()).and_return(q)
       Chef::Knife::Ssh.stub(:ssh_command).with("some command")
-      step=Champu::Step.new(nil,"title")
+      step=Champu::Step.new("title")
       step.search("some criteria")
       step.execute("some command")
     end
+    it "should allow user to specify step specific ssh config" do
+      opts={:user=>'user',:identity_file=>'xx.pem'}
+      step=Champu::Step.new("title") 
+      step.config(opts)
+      step.config.should  == opts
+    end
     it "should allow user to set the type of the step" do
       pending
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: champu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies: []
 description: A simple orchestration/workflow dsl on top of knife ssh
 email: dey.ranjib@gmail.com