toquen 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4170f1693c5c6bfaa962826d43179a5f6eee4583
-  data.tar.gz: 541031a124b960ed711485f99805ccda367f00e6
+  metadata.gz: 1e7f850c2fee7fddfffa545de77b361a2b26f5c1
+  data.tar.gz: 01e9291df348e40badcd3c5c933f45d6e92789a2
 SHA512:
-  metadata.gz: d794d3149af0c9ad3b1002109496b9bc1f94959b29a8e9e8963062a7c2a84d1d695e886f823c35ad0859df0592baeddf1ee109e5f84766d9f7f63777892fdfac
-  data.tar.gz: b9067b1456a24d82bd83485f0229b4cc45d302098328dab95cb0180251fc03ae0bb38ed07fc80f12ac6d73878d9d92b4051ba3acfaf81d42b0956911ffec7c2d
+  metadata.gz: 30c80fdfc46ea793ec4008a28e50718aa6b8a53f6d1be4dc724c1a90a8fd2938feae36454c4bac10a573b1aeea55a9e908d0e3f3fbc13c9afab2529822b4da0c
+  data.tar.gz: a8bb945cd54bb98e28f66cc3b258f5297636a847e16b10719161980d46f6549e4e9bf0b94ba4021073030e236041b187b09b9822569ed7fe238245b83ebcd57b

data/README.md

@@ -24,7 +24,7 @@ And then on the command line execute:
     $ bundle
     $ cap toquen_install
 
-This will create a config directory with a file named *deploy.rb*.  Edit this file, setting the location of your AWS key, AWS credentials, and chef cookbooks/data bags/roles.
+This will create a config directory with a file named *deploy.rb*.  Edit this file, setting the location of your AWS key, AWS credentials, and chef cookbooks/data bags/roles.  If your servers are in a region (or regions) other than us-east-1, then you'll need to set the region as [described below](#additional-configuration).
 
 Then, in AWS, create an [AWS instance tag](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) named "Roles" for each instance, using a space separated list of chef roles as the value.  The "Name" tag must also be set or the instance will be ignored.
 
@@ -90,6 +90,12 @@ By default, instance information is only pulled out of the default region (us-ea
 set :aws_regions, ['us-west-1', 'us-west-2']
 ```
 
+You can also specify the location to upload the kitchen before running chef.  By default, this is set to the ssh user's home directory.
+
+```ruby
+set :chef_upload_location, "/tmp/toquen"
+```
+
 ## View Instances
 To see details about your aws instances you can use the **details** cap task.
 

data/lib/toquen/capistrano.rb

@@ -2,6 +2,8 @@ require 'capistrano/setup'
 require 'capistrano/console'
 require 'set'
 
+set :chef_upload_location, -> { "/home/#{fetch(:ssh_options)[:user]}" }
+
 desc "update local cache of servers and roles"
 task :update_roles do
   load Pathname.new fetch(:deploy_config_path, 'config/deploy.rb')
@@ -35,7 +37,7 @@ end
 
 desc "Update cookbooks/data bags/roles on server"
 task :update_kitchen do
-  kitchen = "/home/#{fetch(:ssh_options)[:user]}/kitchen"
+  kitchen = "#{fetch(:chef_upload_location)}/kitchen"
   lkitchen = "/tmp/toquen/kitchen"
   user = fetch(:ssh_options)[:user]
   key = fetch(:ssh_options)[:keys].first
@@ -62,7 +64,7 @@ task :update_kitchen do
   on roles(:all), in: :parallel do |host|
     run_locally do
       info "Sending kitchen to #{host}..."
-      execute "rsync -avzk --delete -e 'ssh -i #{key}' #{lkitchen} #{user}@#{host}:/home/#{fetch(:ssh_options)[:user]}"
+      execute "rsync -avzk --delete -e 'ssh -i #{key}' #{lkitchen} #{user}@#{host}:#{fetch(:chef_upload_location)}"
     end
   end
 end
@@ -74,9 +76,11 @@ task :cook do
     roles = host.properties.roles.reject { |r| r.to_s.start_with?('server-') or r == :all }
     roles = roles.map { |r| "\"role[#{r}]\"" }.join(',')
     info "Roles for #{host}: #{roles}"
-    tfile = "/home/#{fetch(:ssh_options)[:user]}/chef.json"
+    tfile = "chef.json"
     upload! StringIO.new("{ \"run_list\": [ #{roles} ] }"), tfile
-    execute "sudo chef-solo -c kitchen/chef_config.rb -j #{tfile}"
+    within fetch(:chef_upload_location) do
+      execute "sudo chef-solo -c #{fetch(:chef_upload_location)}/kitchen/chef_config.rb -j #{tfile}"
+    end
   end
 end
 before :cook, :update_kitchen

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano