solokit 0.0.6 → 0.0.7

data/CHANGELOG

@@ -0,0 +1,4 @@
+0.0.7
+
+Major speed improvment by reducing the number of ssh logins.
+

data/README.markdown

@@ -12,7 +12,7 @@ Cookbooks and configuration
 
 Solokit includes some defaults so that you don't have to repeat the same things for each server. Any "cookbook" or "chef" directories in the root of your project will be copied over the defaults. The same goes for any "cookbook" or "chef" directories for a specific environment.
 
-An environment can be anything from one server to a staging cluster. Within an environment you can run specific configuration for each server, but Solokit defaults to "server.json".
+An environment can be anything from one server to a complete cluster. Within an environment you can run specific configuration for each server, but Solokit defaults to "server.json".
 
 For each layer, Solokit looks for a directory structure like this:
 
@@ -61,7 +61,7 @@ Add user configuration to users.yml (optional, but you need to provide a chef/ro
         hash: $1$8jLGWmPB$yFGmUThzbL0DMarc1CIY1/
         keys: user@computer
     
-      ## -- Shared users --
+      ## Shared users
       deploy:
         keys: group/developers 
      
@@ -70,7 +70,7 @@ Add user configuration to users.yml (optional, but you need to provide a chef/ro
         users: group/developers deploy
         sudo: group/developers
 
-And keys below "public_keys" that have names ending in ".pub".
+Add keys below "public_keys" that have names ending in ".pub".
 
     mkdir -p public_keys
     echo "your key" > public_keys/your_key@computer.pub

data/lib/chef.rb

@@ -2,6 +2,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'ssh.rb'))
 
 module Solokit
   class Chef
+    TEMP_PATH="/tmp/solokit_upload"
+
     def initialize(ip, name, env, debug_ssh, user = 'root')
       @ip, @name, @env = ip, name, env
       @ssh = SSH.new(ip, user, debug_ssh)
@@ -15,16 +17,17 @@ module Solokit
 
     def upload(root = "/")
       solokit_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      @ssh.run("rm -rf #{root}var/chef-solo", false) &&
-      @ssh.run("rm -rf #{root}etc/chef", false) &&
-      upload_files("#{solokit_path}/cookbooks/upstream/*", "#{root}var/chef-solo/upstream-cookbooks") &&
-      upload_files("#{solokit_path}/cookbooks/site/*", "#{root}var/chef-solo/site-cookbooks") &&
-      upload_files("cookbooks/upstream/*", "#{root}var/chef-solo/upstream-cookbooks") &&
-      upload_files("cookbooks/site/*", "#{root}var/chef-solo/site-cookbooks") &&
-      upload_files("envs/#{@env}/cookbooks/*", "#{root}var/chef-solo/site-cookbooks") &&
-      upload_files("#{solokit_path}/chef/*", "#{root}etc/chef") &&
-      upload_files("chef/*", "#{root}etc/chef") &&
-      upload_files("envs/#{@env}/chef/*", "#{root}etc/chef") 
+
+      add_upload("#{solokit_path}/cookbooks/upstream/*", "#{root}var/chef-solo/upstream-cookbooks") &&
+      add_upload("#{solokit_path}/cookbooks/site/*", "#{root}var/chef-solo/site-cookbooks") &&
+      add_upload("cookbooks/upstream/*", "#{root}var/chef-solo/upstream-cookbooks") &&
+      add_upload("cookbooks/site/*", "#{root}var/chef-solo/site-cookbooks") &&
+      add_upload("envs/#{@env}/cookbooks/*", "#{root}var/chef-solo/site-cookbooks") &&
+      add_upload("#{solokit_path}/chef/*", "#{root}etc/chef") &&
+      add_upload("chef/*", "#{root}etc/chef") &&
+      add_upload("envs/#{@env}/chef/*", "#{root}etc/chef") &&
+      @ssh.run("rm -rf #{root}var/chef-solo #{root}etc/chef", false) &&
+      @ssh.rsync("#{TEMP_PATH}#{root}", root, true) 
     end
 
     def run(debug = false, root = "/")
@@ -49,9 +52,12 @@ module Solokit
       "PATH=\"#{root}ruby/bin:/sbin:$PATH\""
     end
 
-    def upload_files(from, to)
-      return true unless File.exists?(from.gsub(/\*/, ''))
-      @ssh.run("mkdir -p #{to}") && @ssh.rsync(from, to, true) 
+    def add_upload(from, to)
+      if File.exists?(from.gsub(/\*/, ''))
+        system("mkdir -p #{TEMP_PATH}#{to} && cp -rf #{from} /tmp/solokit_upload#{to}")
+      else
+        true
+      end
     end
 
     def installed?
@@ -59,3 +65,4 @@ module Solokit
     end
   end
 end
+

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solokit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rvmrc
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENCE