fezzik 0.8.0 → 0.8.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 46f03aaa7fe191aeba95f63afef24ca9f2bec9d6
+  data.tar.gz: 237458033bb4d72fe30414e97213aba3a420f025
+SHA512:
+  metadata.gz: 8a569eaeaa834041ea0273c71e7485a47be4e4e64c3145f9b2fddaaf66c39f75149a3c29cc7f5851dbc0ddc724b8d85ee0a030bee8ff2054f91465989c1b3bce
+  data.tar.gz: d4096d2c482a9d763f1883ca172fc3848b5e4fa35b8c245416e51b348a68425e9e5749183ed4e378c13c8812837ddf40766ae67bce92149c62ceed8947ec60df

data/README.md

@@ -19,10 +19,11 @@ Require Fezzik in your project Rakefile and define a destination:
 
 ```ruby
 require "fezzik"
+include Fezzik::DSL
 
-Fezzik.destination :prod do
-  Fezzik.set :user, "root"
-  Fezzik.set :domain, "myapp.com"
+destination :prod do
+  set :user, "root"
+  set :domain, "myapp.com"
 end
 ```
 
@@ -38,7 +39,7 @@ Write some host tasks that will execute on the specified destination:
 
 ```ruby
 namespace :fezzik do
-  Fezzik.host_task :echo do
+  host_task :echo do
     run "echo 'Running on #{host}'"
   end
 end
@@ -68,8 +69,8 @@ end
 would look like this as a host task:
 
 ```ruby
-Fezzik.host_task :echo, :args => [:arg1, :arg2],
-                        :deps => [:dep1, :dep2] do |t, args|
+host_task :echo, :args => [:arg1, :arg2],
+                 :deps => [:dep1, :dep2] do |t, args|
   ...
 end
 ```
@@ -81,24 +82,25 @@ One of the more useful things you can use Fezzik for is handling deployments.
 
 ```ruby
 require "fezzik"
+include Fezzik::DSL
 
 # Fezzik will automatically load any .rake files it finds in this directory.
 Fezzik.init(:tasks => "config/tasks")
 
 # The only special settings are `:domain` and `:user`. The rest are purely convention. All settings can be
-# retrieved in your tasks with `get` (e.g., `Fezzik.get :current_path`).
-Fezzik.set :app, "myapp"
-Fezzik.set :user, "root"
-Fezzik.set :deploy_to, "/opt/#{app}"
-Fezzik.set :release_path, "#{deploy_to}/releases/#{Time.now.strftime("%Y%m%d%H%M")}"
-Fezzik.set :current_path, "#{deploy_to}/current"
-
-Fezzik.destination :staging do
-  Fezzik.set :domain, "myapp-staging.com"
+# retrieved in your tasks with `get` (e.g., `get :current_path`).
+set :app, "myapp"
+set :user, "root"
+set :deploy_to, "/opt/#{get :app}"
+set :release_path, "#{get :deploy_to}/releases/#{Time.now.strftime("%Y%m%d%H%M")}"
+set :current_path, "#{get :deploy_to}/current"
+
+destination :staging do
+  set :domain, "myapp-staging.com"
 end
 
-Fezzik.destination :prod do
-  Fezzik.set :domain, "myapp.com"
+destination :prod do
+  set :domain, "myapp.com"
 end
 ```
 
@@ -111,7 +113,7 @@ $ fez get deploy
     [new] deploy.rake
 ```
 
-You'll need to edit the fezzik:start and fezzik:stop tasks in deploy.rake since those are specific to your
+You'll need to edit the `fezzik:start` and `fezzik:stop` tasks in deploy.rake since those are specific to your
 project.
 
 ```ruby
@@ -119,12 +121,12 @@ namespace :fezzik do
   ...
   desc "runs the executable in project/bin"
   host_task :start do
-    puts "starting from #{(run "readlink #{Fezzik.get :current_path}", :output => capture)[:stdout] }}"
-    run "cd #{Fezzik.get :current_path} && ./bin/run_app.sh"
+    puts "starting from #{(run "readlink #{get :current_path}", :output => capture)[:stdout] }}"
+    run "cd #{get :current_path} && ./bin/run_app.sh"
   end
 
   desc "kills the application by searching for the specified process name"
-  host_task :stop do
+  Fezzik.host_task :stop do
     puts "stopping app"
     run "(kill `ps aux | grep 'myapp' | grep -v grep | awk '{print $2}'` || true)"
   end
@@ -152,9 +154,9 @@ $ fez get deploy
 ```
 
 ```ruby
-Fezzik.destination :prod do
-  Fezzik.set :domain, "myapp.com"
-  Fezzik.env :rack_env, "production"
+destination :prod do
+  set :domain, "myapp.com"
+  env :rack_env, "production"
 end
 ```
 
@@ -164,27 +166,27 @@ project directly.
 
 ```ruby
   desc "runs the executable in project/bin"
-  Fezzik.host_task :start do
-    run "cd #{Fezzik.get :current_path} && (source environment.sh || true) && ./bin/run_app.sh"
+  host_task :start do
+    run "cd #{get :current_path} && (source environment.sh || true) && ./bin/run_app.sh"
   end
 ```
 
 You can assign different environments to subsets of hosts:
 
 ```ruby
-Fezzik.destination :prod do
-  Fezzik.set :domain, ["myapp1.com", "myapp2.com"]
-  Fezzik.env :rack_env, "production"
-  Fezzik.env :is_canary, "true", :hosts => ["myapp1.com"]
+destination :prod do
+  set :domain, ["myapp1.com", "myapp2.com"]
+  env :rack_env, "production"
+  env :is_canary, "true", :hosts => ["myapp1.com"]
 end
 ```
 
-Fezzik accepts multiple destinations in the call to `Fezzik.destination`.
+Fezzik accepts multiple destinations in the call to `destination`.
 This can be useful if you have common environment variables shared across destinations.
 
 ```ruby
-Fezzik.destination :staging, :prod do
-  Fezzik.env :unicorn_workers, 4
+destination :staging, :prod do
+  env :unicorn_workers, 4
 end
 ```
 
@@ -199,8 +201,8 @@ end
 To access the environment for the currently targeted host:
 
 ```ruby
-Fezzik.host_task :inspect_environment do
-  puts Fezzik.environemnts[host].inspect
+host_task :inspect_environment do
+  puts Fezzik.environments[host].inspect
 end
 ```
 
@@ -212,17 +214,17 @@ to their purpose. For example, you might want to perform your initial package in
 your app as an unprivileged user.
 
 ```ruby
-Fezzik.destination :prod do
-  Fezzik.set :domain, "myapp.com"
-  Fezzik.role :root_user, :user => "root"
-  Fezzik.role :run_user, :user => "app"
+destination :prod do
+  set :domain, "myapp.com"
+  role :root_user, :user => "root"
+  role :run_user, :user => "app"
 end
 
-Fezzik.host_task :install, :roles => :root_user
+host_task :install, :roles => :root_user
   # Install all the things.
 end
 
-Fezzik.host_task :run, :roles => :run_user
+host_task :run, :roles => :run_user
   # Run all the things.
 end
 ```
@@ -230,24 +232,24 @@ end
 Or, you might have different domains for database deployment and app deployment.
 
 ```ruby
-Fezzik.destination :prod do
-  Fezzik.set :user, "root"
-  Fezzik.role :db, :domain => "db.myapp.com"
-  Fezzik.role :app, :domain => "myapp.com"
+destination :prod do
+  set :user, "root"
+  role :db, :domain => "db.myapp.com"
+  role :app, :domain => "myapp.com"
 end
 ```
 
 Roles in destination blocks can override global role settings.
 
 ```ruby
-Fezzik.role :app, :domain => "localhost"
+role :app, :domain => "localhost"
 
-Fezzik.destination :prod do
-  Fezzik.role :app, :domain => "myapp.com"
+destination :prod do
+  role :app, :domain => "myapp.com"
 end
 ```
 
-The `Fezzik.role` method accepts a role name and a hash of values that you want assigned with the
+The `role` method accepts a role name and a hash of values that you want assigned with the
 `set :var, value` syntax. These will override the global or destination settings when a host task is
 run.
 
@@ -293,8 +295,8 @@ As a helper, any `puts` used from within a host task will call an overridden thr
 
 ## DSL
 
-Fezzik comes with a DSL module that you can optionally include in the top level of your Rakefiles. It exposes
-the following functions:
+Fezzik comes with a DSL module that you can optionally include in the top level of your Rakefiles with
+`include Fezzik::DSL`. It exposes the following functions:
 
 ```
 destination
@@ -306,22 +308,8 @@ role
 capture_output
 ```
 
-This lets you write your configuration more tersely:
-
-```ruby
-include Fezzik::DSL
-
-destination :prod do
-  set :domain "myapp.com"
-  env :rack_env, "production"
-  role :root_user, :user => "root"
-end
-
-host_task :echo do
-  run "echo 'Running on #{host}'"
-end
-```
-
+If you don't want to include these functions in your top-level namespace they can all be called directly on
+the Fezzik module, e.g., `Fezzik.destination`.
 
 ## Included Tasks
 
@@ -407,16 +395,17 @@ connection pool, but necessarily introduces a few breaking changes. These are de
   it manually:
 
     ```ruby
-    Fezzik.set :current_path, "#{Fezzik.get :deploy_to}/current`.
+    set :current_path, "#{get :deploy_to}/current`.
     ```
 
 - The helper method `rsync` no longer exists. Instead of `rsync "..."` use `system("rsync -az ...")`
+- The helper method `sudo` no longer exists. Instead of `sudo "..."` use `run "sudo ..."`
 
 ### Deprecations
 
 - The `remote_task` method is deprecated. Use `host_task` instead.
-- Using settings defined by `Fezzik.set` as top-level method calls is deprecated. For example, use
-  `Fezzik.get :domain` instead of `domain`.
+- Using settings defined by `set` as top-level method calls is deprecated. For example, use
+  `get :domain` instead of `domain`.
 - Fezzik::Util.capture_output is deprecated. Pass options directly to `run` instead:
 
     ```ruby

data/fezzik.gemspec

@@ -24,8 +24,7 @@ EOS
   s.files = `git ls-files`.split("\n")
 
   s.add_dependency "rake"
-  s.add_dependency "weave", "=0.1.0"
+  s.add_dependency "weave", "=0.2.0"
 
   s.add_development_dependency("scope", "~>0.2.3")
-  s.add_development_dependency("vagrant", "~>1.0.5")
 end

data/lib/fezzik/host_task.rb

@@ -18,10 +18,10 @@ module Fezzik
 
       if @roles.empty?
         hosts = Fezzik.get(:domain).map { |domain| "#{Fezzik.get(:user)}@#{domain}" }
-        @@connection_pool ||= Weave.connect(hosts)
+        @@connection_pool ||= Weave::ConnectionPool.new
         @host_actions.each do |action|
           begin
-            @@connection_pool.execute(:args => [self, args], &action)
+            @@connection_pool.execute_with(hosts, :args => [self, args], &action)
           rescue Weave::Error => e
             STDERR.puts "Error running command in HostTask '#{@name}':"
             abort e.message
@@ -32,10 +32,10 @@ module Fezzik
           Fezzik.with_role(role) do
             hosts = Fezzik.get(:domain).map { |domain| "#{Fezzik.get(:user)}@#{domain}" }
             @@role_connection_pools ||= {}
-            @@role_connection_pools[role] ||= Weave.connect(hosts)
+            @@role_connection_pools[role] ||= Weave::ConnectionPool.new
             @host_actions.each do |action|
               begin
-                @@role_connection_pools[role].execute(:args => [self, args], &action)
+                @@role_connection_pools[role].execute_with(hosts, :args => [self, args], &action)
               rescue Weave::Error => e
                 STDERR.puts "Error running command in HostTask '#{@name}' with role '#{role}':"
                 abort e.message

data/lib/fezzik/version.rb

@@ -1,3 +1,3 @@
 module Fezzik
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fezzik
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.8.1
 platform: ruby
 authors:
 - Daniel MacDougall
@@ -10,44 +9,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: weave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: scope
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,27 +49,10 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 description: A light deployment system that gets out of your way
 email: dmacdougall@gmail.com
 executables:
@@ -111,31 +88,28 @@ files:
 - test/integration_test_helper.rb
 homepage: http://github.com/dmacdougall/fezzik
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2107637702954244595
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fezzik
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 2
 summary: Fezzik adds remote ssh capabilities to Rake. It simplifies running commands
   on remote servers and can be used for anything from deploying code to installing
   libraries remotely.
 test_files: []
+has_rdoc: