capistrano-cook 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f29cbcb547104b83083454b889cc8f965ece707
-  data.tar.gz: f8decfc0eb64080421acbd3b89efb4c5698043de
+  metadata.gz: d378d302253f0b065878bb5fca08b20fbf373cc6
+  data.tar.gz: 9660da71ee304afef0eea1652965a9909f91cd06
 SHA512:
-  metadata.gz: 62d4fd37409bbe9dd5d7ea1dc076ad90b39309d86b1e01f67a82cef8d59b01c6c47f5027a2a614de410f313daddd622781ae6abbeaaf1fce6558d73e0e24e8db
-  data.tar.gz: 163aa753f48b2235fc65c80734c8ebcf468f10f9e0ad3aff5614544b5e6f708bfb14da4ede51c6994e03252298cbde18f8b34ec07a6b906e3115e00ad08a9343
+  metadata.gz: b1ef7d27630b31c425998da6e6b7c8ace0bc17faa04aab6b4dad6517a391ae199ebeb8b2073d781ddfe1cf63024804318a5cb6c19cee85042bb39757aba7dbb1
+  data.tar.gz: 64cf8e1d15deb1653542ec0c91979f8f3856a2cd469e8674d111f7ec4a30318ada313312dc4f5756fd1971e6ab1344f5c6ed330fc15e22c32e2037014aea7d1f

data/capistrano-cook.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler", "~> 1.6"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
-  gem.add_development_dependency "chef-zero"
+  gem.add_development_dependency "chef-zero", "~> 2.0.2"
 end
 

data/lib/capistrano/chef/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Chef
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end
 end

data/lib/capistrano/dsl/chef.rb

@@ -48,6 +48,7 @@ module Capistrano
       #
       def chef_scope(field, term="*")
         scopes = fetch(:chef_scopes) || []
+$        scopes.delete_if { |scope| scope =~ /chef_environment/ }
         set :chef_scopes, scopes << [field, term].join(":")
       end
 

data/test/capistrano/dsl/chef_test.rb

@@ -90,7 +90,8 @@ class Capistrano::DSL::ChefTest < Minitest::Test
 
     chef_scope :chef_environment, env
 
-    assert_includes fetch(:chef_scopes), "chef_environment:#{env}"
+    assert_equal fetch(:chef_scopes), ["chef_environment:#{env}"]
+    # assert_includes fetch(:chef_scopes), "chef_environment:#{env}"
 
     chef_role :rubix, "name:test_node_*"
 
@@ -99,6 +100,11 @@ class Capistrano::DSL::ChefTest < Minitest::Test
     servers_with_role :rubix do |server|
       assert_equal hostname, server.hostname
     end
+
+    env = "dietryin"
+    chef_scope :chef_environment, env
+
+    assert_equal fetch(:chef_scopes), ["chef_environment:#{env}"]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cook
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Justin Reagor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -84,16 +84,16 @@ dependencies:
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
 description: Provides easy support for using Capistrano and Chef together
 email:
 - cheapRoc@gmail.com