ol-whisk_deploy 0.6.25 → 0.6.26

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2U4Y2VmZDdmNWU5OTRkNzdmZGJhZDNiMjhlN2NlMzNiZjgyOWIxMg==
+  data.tar.gz: !binary |-
+    NWNjYjkzZTU2YmM5YjU3ZDdiYzA3MWJiNmY1MTEwZTcyNGE0NWE2Zg==
+SHA512:
+  metadata.gz: !binary |-
+    NDk2YmFjMGRiNjljMjdhYjVlYTVlODAxOTNmZWI4OTA3MWJmNGU4NjRjZTY0
+    MDJjMmI2NTYxYjZkYjNmZTg0OGE0YzJhZWJhZGM1MmYyZWE0NWExMzFhMTU3
+    YWRkMmJjMzU4MzQyMzE1NDZmNzlmMWNjOTU3MGI4ODkyMmYwNTU=
+  data.tar.gz: !binary |-
+    YWEyMTY5M2YyZmYyZmE3OWIyYmM2ZmIwZTJjNGY0NmM5ZjRhMDg4NjNiODBm
+    ODQ2MWY5MTZmZWFhNmU0OWY2NzJlYjdjNzM0YTYyZGRmMzQxYzlkZDRkYWQ0
+    MWMzMDI5Njc2NjUzMTNkYzRmZjlhZWFkZGI3MzYzNmRiZGMyNTk=

data/README.markdown

@@ -125,7 +125,7 @@ If you're running on OS X or Linux you probably have all of these installed alre
 
 As a gem:
 
-    % gem install whisk\_deploy
+    % gem install whisk_deploy
 
 ### Configuration ###
 
@@ -227,6 +227,17 @@ If you need special flags passed to ssh for a given domain, specify an array of
         - "-p 443"
       deploy_to: "/var/www/www.ogtastic.com"
       repository: "git@ogtastic.com:www.ogtastic.com.git"
+      
+Likewise, if you need special environment variables per domain, specify a hash of `env_vars` names and values:
+
+
+    qa:
+      domain:
+      - name: "ogc@qa.ogtastic.com"
+        env_vars:
+          WORKER_COUNT: 5
+      deploy_to: "/var/www/www.ogtastic.com"
+      repository: "git@ogtastic.com:www.ogtastic.com.git"
 
 ### Specifying domains, with or without roles ###
 

data/lib/whiskey_disk.rb

@@ -127,9 +127,16 @@ class WhiskeyDisk
     return '' unless roles and !roles.empty?
     "export WD_ROLES='#{roles.join(':')}'; "
   end
+  
+  def encode_env_vars(vars)
+    return '' unless vars and !vars.empty?
+    vars.map do |name, val|
+      "export #{name}='#{val}'; "
+    end.join
+  end
 
   def build_command(domain, cmd)
-    "#{'set -x; ' if debugging?}" + encode_roles(domain['roles']) + cmd
+    "#{'set -x; ' if debugging?}" + encode_env_vars(domain['env_vars']) + encode_roles(domain['roles']) + cmd
   end
 
   def rake_command

data/spec/whiskey_disk_spec.rb

@@ -1119,7 +1119,14 @@ describe '@whiskey_disk' do
       it 'includes domain role settings when the domain has roles' do
         @domain = { 'name' => @domain_name, 'roles' => [ 'web', 'db' ] }
         @whiskey_disk.configuration = { 'domain' => [ @domain ] }
-        @whiskey_disk.build_command(@domain, 'ls').should.match /export WD_ROLES='web:db'; ls/
+        expect(@whiskey_disk.build_command(@domain, 'ls')).to match(/export WD_ROLES='web:db'; ls/)
+      end
+
+      it  'incldues other arbitrary env vars when specified' do
+        @domain = { 'name' => @domain_name, 'roles' => [ 'web', 'db' ], 'env_vars' => { 'WORKER_COUNT' => 5 } }
+        @whiskey_disk.configuration = { 'domain' => [ @domain ] }
+        cmd = @whiskey_disk.build_command(@domain, 'ls')
+        expect(cmd).to include("export WORKER_COUNT='5';")
       end
     end
 

data/whisk_deploy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ol-whisk_deploy"
-  s.version = "0.6.25"
+  s.version = "0.6.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley", "Jesse R. Adams"]
@@ -211,5 +211,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rake>, [">= 0"])
   end
+  
+  s.add_development_dependency "bacon", ["~> 1.2.0"]
+  s.add_development_dependency "facon", ["~> 0.5.0"]
+  s.add_development_dependency "rspec", ["~> 2.0"]
 end
-

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ol-whisk_deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.25
-  prerelease: 
+  version: 0.6.26
 platform: ruby
 authors:
 - Rick Bradley
@@ -15,7 +14,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,11 +21,52 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: facon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Opinionated gem for doing fast git-based server deployments.
 email: jesse@techno-geeks.org
 executables:
@@ -216,25 +255,24 @@ files:
 - whisk_deploy.gemspec
 homepage: http://github.com/jesseadams/whiskey
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: embarrassingly fast deployments.