knife-hitori 0.0.3 → 0.0.3.1

data/lib/chef/knife/hitori/version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Knife
     class Hitori
-      VERSION = '0.0.3'
+      VERSION = '0.0.3.1'
     end
   end
 end

data/lib/knife-hitori/lib/run_remote_cook.rb

@@ -34,7 +34,7 @@ module KnifeHitori
       chef_solo_filename = 'do_cook.sh'
       files_info = []
       files_info << {src: config[:chef_solo_base_dir], dest: knife[:remote_chef_dir], opts: {:recursive => true, :verbose => true}}
-      files_info << {src: KnifeHitori::resource(chef_solo_filename), dest: remote_dir, opts: {:verbose => true}}
+      files_info << {src: KnifeHitori::resource(chef_solo_filename), dest: "#{remote_dir}/#{chef_solo_filename}", opts: {:verbose => true}}
       upload_files(files_info)
       console_log "Upload is done #{server.public_ip_address}\n"
       # run chef-solo
@@ -86,6 +86,7 @@ module KnifeHitori
       Net::SCP.start(server.public_ip_address, knife[:ssh_user], :keys => [knife[:identity_file]], :compression => true) do |scp|
         channels = []
         files_info.each do |info|
+          create_remote_dirs(info)
           channels << scp.upload(info[:src], info[:dest], info[:opts])
         end
         channels.each do |ch|
@@ -94,6 +95,20 @@ module KnifeHitori
       end
     end
 
+    def create_remote_dirs(info)
+      if info[:opts] && info[:opts][:recursive]
+        #dir_list = []
+        #Dir.glob("#{info[:src]}/**/").each do |d|
+        #  relative_dir = d.gsub("#{info[:src]}/", '')
+        #  dir_list << "#{info[:dest]}/#{relative_dir}"
+        #end
+        #cmd = "mkdir -p #{dir_list.join(' ')}"
+      else
+        cmd = "mkdir -p #{File.dirname(info[:dest])}"
+        exec_remote(cmd)
+      end
+    end
+
     def exec_remote(command)
       Net::SSH.start(server.public_ip_address, knife[:ssh_user], :keys => [knife[:identity_file]]) do |ssh|
         ssh.open_channel do |ch|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-hitori
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef