knife-chop 0.8.0 → 0.8.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/VERSION +1 -1
- data/lib/chef/knife/chop_base.rb +12 -12
- data/lib/chef/knife/chop_upload.rb +4 -3
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
M2IzMjcxMjNlZGRjNjA2YWVjMjdmNTkwMzA2MjRjZjA2MTJjMTMxYw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZmNiM2Y0M2U3YWMyZDkxNzNhMDVhNjllOGRjMzVhY2Q3NzI0ZmMwYw==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NTAwNjRhZGM4NDFlYTkzMmRlZWJkNzFjOGFhM2VkZmMyZDUwMmVkNTE5OTdh
|
10
|
+
NzIxYmI1MDAwZWY5OWY4Yjk0NjM4Y2FkYTZiOWE4MmZiMDJhZmQ4ODIwZmE0
|
11
|
+
NzYzZmIxOGViOGJkN2NkMzQzMjVjMDgzMTYwNmVlODZhMWRhYjg=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
N2UzNzI2MWIzM2ZhYzg4MGRmN2QxYmNkMjhiNTY4YWM2MTZlMmQ0MmI0MmU2
|
14
|
+
ODdlZjViODJiYjBhOWMwOTA5YWNiODUyYWE0MmVlYTVjZTgwMDRhMDY1YTc3
|
15
|
+
ZDdjM2E5YmQ5MWNmMDBhNTNhZjM3NGM4ZTQ2Zjg5MDk0MThlMjY=
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.8.
|
1
|
+
0.8.2
|
data/lib/chef/knife/chop_base.rb
CHANGED
@@ -548,18 +548,18 @@ class Chef
|
|
548
548
|
def validate_options(options=nil)
|
549
549
|
options = @config unless options
|
550
550
|
|
551
|
-
# Check for the necessary environment variables
|
552
|
-
logStep ("Check ENVironment")
|
553
|
-
env = ENV.to_hash
|
554
|
-
missing = {}
|
555
|
-
%w(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY KNIFE_CHEF_SERVER_URL KNIFE_CLIENT_KEY KNIFE_CLIENT_NAME).each { |k|
|
556
|
-
|
557
|
-
}
|
558
|
-
|
559
|
-
if missing.count() > 0
|
560
|
-
|
561
|
-
|
562
|
-
end
|
551
|
+
# # Check for the necessary environment variables
|
552
|
+
# logStep ("Check ENVironment")
|
553
|
+
# env = ENV.to_hash
|
554
|
+
# missing = {}
|
555
|
+
# %w(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY KNIFE_CHEF_SERVER_URL KNIFE_CLIENT_KEY KNIFE_CLIENT_NAME).each { |k|
|
556
|
+
# missing[k] = true unless ENV.has_key?(k)
|
557
|
+
# }
|
558
|
+
#
|
559
|
+
# if missing.count() > 0
|
560
|
+
# #@logger.error "Missing keys: #{missing.keys.ai}"
|
561
|
+
# raise ChopError.new("Missing environment variables: #{missing.keys}")
|
562
|
+
# end
|
563
563
|
end
|
564
564
|
|
565
565
|
# -----------------------------------------------------------------------------
|
@@ -90,8 +90,8 @@ class Chef
|
|
90
90
|
rsrc = args[:resource]
|
91
91
|
verb = args[:verb] || "from file"
|
92
92
|
xtra = args[:extra] || ''
|
93
|
-
cmdp = args[:command] || lambda{|
|
94
|
-
%(knife #{
|
93
|
+
cmdp = args[:command] || lambda{|r,v,x|
|
94
|
+
%(knife #{r} #{v} #{x})
|
95
95
|
}
|
96
96
|
filp = args[:fileproc] || lambda{|cmd,name,file|
|
97
97
|
# name not used/needed
|
@@ -161,7 +161,8 @@ class Chef
|
|
161
161
|
@logger.debug "... #{cmd}" if fLog
|
162
162
|
if @use_knife_api
|
163
163
|
unless @config[:dry_run]
|
164
|
-
subc = _getsubcmd.call
|
164
|
+
#subc = _getsubcmd.call
|
165
|
+
subc = getKnifeSubCommand(rsrc,verb)
|
165
166
|
subc.name_args = rsrc == 'cookbook' ? [ name ] : [ file ]
|
166
167
|
subc.run
|
167
168
|
end
|