buckknife 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,7 +21,6 @@ module BuckKnife
21
21
  c.opt '-d', project.distro
22
22
  c.opt '-s', chef_server_url
23
23
  c.opt '-N', node.name
24
- c.opt '-i', project.identity_file if project.identity_file
25
24
  c.opt '-x', project.ssh_username if project.ssh_username
26
25
  end
27
26
  end
@@ -38,6 +38,7 @@ module BuckKnife
38
38
 
39
39
  def command
40
40
  super.tap do |c|
41
+ c.opt '-i', identity_file if identity_file
41
42
  c.opt '-Z', availability_zone if availability_zone
42
43
  end
43
44
  end
@@ -52,6 +53,10 @@ module BuckKnife
52
53
  super || "m1.large"
53
54
  end
54
55
 
56
+ def identity_file
57
+ project.identity_file || Chef::Config[:knife][:euca_identity_file]
58
+ end
59
+
55
60
  def availability_zone
56
61
  Chef::Config[:region]
57
62
  end
@@ -1,3 +1,3 @@
1
1
  module BuckKnife
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
@@ -29,7 +29,7 @@ module BuckKnife
29
29
  node_name = @name_args[1]
30
30
  nodes = Array(project.node(node_name) || project.nodes)
31
31
 
32
- project.identity_file = Chef::Config[:knife][:euca_identity_file] if Chef::Config[:knife][:euca_identity_file]
32
+ project.identity_file = config[:identity_file] if config[:identity_file]
33
33
  project.provider = config[:provider] if config[:provider]
34
34
  project.ssh_username = config[:ssh_username] if config[:ssh_username]
35
35
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buckknife
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
4
+ hash: 21
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 4
10
- version: 0.0.4
9
+ - 5
10
+ version: 0.0.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Ben Marini
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-07-22 00:00:00 -07:00
19
+ date: 2011-07-25 00:00:00 -07:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency