knife-joyent 0.4.12 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbadbfdfac0b82475098817aa9df09ebffc045c6
-  data.tar.gz: fa9ce1e48f64143ec93718585e971d65dba56eb9
+  metadata.gz: 48fd210adbbdd0a110d4fc3dbcc03e53e068f862
+  data.tar.gz: 6b5935871add6e57e28c292e7ec1a85c73d87931
 SHA512:
-  metadata.gz: 05932dc50d37e0f493c7eb00f79e7080c4e0136e1f2e8f2de52909a3fb9cd6c0a845e2aaf841717ab773efd5c8d8c08ad7e3a0aa8b5b9bdba8805b7d90a051af
-  data.tar.gz: 112e490a67295fa28c799fb032fa6883e89975242a6eecfdeb2aef060a4307b3481b68437c60390f9ba2da6f2e3275acbd403e0b08f4b62c61c6a982fc2174c0
+  metadata.gz: 04830213a591a6eaa707b945bee30615c837c3f8bddf5080fd4fb50be62f7d101643516719ea66aa2d48e6d6f5b5968a9fe44e6eb58198df36b0d9373e35a1e3
+  data.tar.gz: d7e940cf02502789ef8352d47429e291264ed2bb630b8ea57d8ad566ff4d00d644663ee5503629cd662f8369c5111ce685a447bbf12b9779f32f7843250716bf

data/README.md

@@ -1,10 +1,13 @@
 Knife Joyent
 ===
 
-This is a [Knife](http://wiki.opscode.com/display/chef/Knife) plug-in for Joyent CloudAPI. This plug-in gives knife
-the ability to create, bootstrap, and manage servers on the [Joyent Public Cloud](http://www.joyentcloud.com/) as well as Cloud providers powered by Joyent's [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/) product offering.
+This is a [Knife](http://docs.chef.io/knife.html) plug-in for Joyent
+CloudAPI. This plug-in gives knife the ability to create, bootstrap, and
+manage servers on the [Joyent Public Cloud](https://www.joyent.com/) as
+well as cloud providers powered by Joyent's [Private Cloud](https://www.joyent.com/private-cloud/)
+product offering.
 
-For more information on Joyent CloudAPI, see: [CloudAPI Documentation](http://api.joyentcloud.com/docs)
+For more information on Joyent CloudAPI, see: [CloudAPI Documentation](https://apidocs.joyent.com/cloudapi/).
 
 ## Installation
 
@@ -109,38 +112,42 @@ or username and password
     knife[:joyent_username] = "Your Joyent CloudAPI username"
     knife[:joyent_password] = "Your Joyent CloudAPI password"
 
-When authenticating with your ssh key (which we highly recommend), knife-joyent will
-attempt to use ssh-agent to sign the request using the key configured with
-``knife[:joyent_keyname]``. If no ssh-agent is present or if the specified identity
-isn't found in the agent, you may be prompted for a pass-phrase. If you do not want
-to use an ``ssh-agent``, you may optionally configure ``knife[:joyent_passphrase]``
-to automatically unlock the key for authentication.
+When authenticating with your ssh key (which we highly recommend),
+knife-joyent will attempt to use ssh-agent to sign the request using the
+key configured with ``knife[:joyent_keyname]``. If no ssh-agent is
+present or if the specified identity isn't found in the agent, you may
+be prompted for a pass-phrase. If you do not want to use an
+``ssh-agent``, you may optionally configure
+``knife[:joyent_passphrase]`` to automatically unlock the key for
+authentication.
 
 #### Optional Configuration
 
 **``joyent_api_url``**
 
-Specifies a custom CloudAPI endpoint, this is required if you want to manage
-machines located in another datacenter or if you want to interface with any CloudAPI
-instance powered by [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
+Specifies a custom CloudAPI endpoint, this is required if you want to
+manage machines located in another datacenter or if you want to
+interface with any CloudAPI instance powered by
+[SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
 
-Defaults to us-west-1
+Defaults to us-sw-1
 
 Available datacenters (currently) are:
 
-    https://eu-ams-1.api.joyentcloud.com
-    https://us-west-1.api.joyentcloud.com
-    https://us-sw-1.api.joyentcloud.com
-    https://us-east-1.api.joyentcloud.com
+    https://eu-ams-1.api.joyent.com
+    https://us-west-1.api.joyent.com
+    https://us-sw-1.api.joyent.com
+    https://us-east-1.api.joyent.com
 
-    # Defaults to https://us-west-1.api.joyentcloud.com/
-    knife[:joyent_api_url] = "https://us-sw-1.api.joyentcloud.com/"
+    # Defaults to https://us-sw-1.api.joyent.com/
+    knife[:joyent_api_url] = "https://us-sw-1.api.joyent.com/"
 
 **``joyent_metadata``**
 
-Metadata to apply to each provisioned machine via the Metadata API. This should take
-the form of a hash with a single level of nesting. See the
-[Metadata API](http://wiki.joyent.com/wiki/display/sdc/Using+the+Metadata+API) for more info.
+Metadata to apply to each provisioned machine via the Metadata API. This
+should take the form of a hash with a single level of nesting. See the
+[Metadata API](http://wiki.joyent.com/wiki/display/sdc/Using+the+Metadata+API)
+for more info.
 
     knife[:joyent_metadata] = {
       "some_data" => "value"
@@ -148,39 +155,42 @@ the form of a hash with a single level of nesting. See the
 
 **``joyent_version``**
 
-By default, knife-joyent will use the version of the Joyent Cloud API that fog prefers. This
-can be overridden in knife.rb as follows:
+By default, knife-joyent will use the version of the Joyent Cloud API
+that fog prefers. This can be overridden in knife.rb as follows:
 
     knife[:joyent_version] = "~7.1"
 
-Some command line options to knife-joyent subcommands may depend on the Joyent API version set.
+Some command line options to knife-joyent subcommands may depend on the
+Joyent API version set.
 
 **``joyent_verify_peer``**
 
-Set to ``false`` to Disable SSL Certificate verification, required if the CloudAPI instance
-uses a self-signed cert. (Default: ``true``)
+Set to ``false`` to Disable SSL Certificate verification, required if
+the CloudAPI instance uses a self-signed cert. (Default: ``true``)
 
 **``provisioner``**
 
-Machines provisioned will be tagged with key ``provisioner`` containing the value specified.
-This is useful for tracking source of provisions for accounts where machines are provisioned
-by/from different sources / users.
+Machines provisioned will be tagged with key ``provisioner`` containing
+the value specified.  This is useful for tracking source of provisions
+for accounts where machines are provisioned by/from different sources /
+users.
 
 ## Contributors
 
- - [Sean Omera](https://github.com/someara) - Opscode
+ - [Sean Omera](https://github.com/someara) - Chef Software
  - [Eric Saxby](https://github.com/sax) - Wanelo
  - [Stephen Lauck](https://github.com/stephenlauck) - ModCloth
  - [Konstantin Gredeskoul](https://github.com/kigster) - Wanelo
 
 ## Bootstrap template for smartos
 
-To bootstrap chef on SmartOS, use the script provided at [joyent/smartmachine_cookbooks](https://github.com/joyent/smartmachine_cookbooks)
+To bootstrap chef on SmartOS, use the script provided at
+[joyent/smartmachine_cookbooks](https://github.com/joyent/smartmachine_cookbooks)
 which sets up chef-client with SMF and installs the basic essentials.
 
 ## License
 
-Copyright 2012 Joyent, Inc
+Copyright 2015 Joyent, Inc
 
 Author: Kevin Chan <kevin@joyent.com>
 

data/knife-joyent.gemspec

@@ -7,10 +7,11 @@ Gem::Specification.new do |s|
   s.version = KnifeJoyent::VERSION
   s.has_rdoc = true
   s.authors = ["Kevin Chan"]
-  s.email = ["kevin@joyent.com"]
-  s.homepage = "https://github.com/kevinykchan/knife-joyent"
+  s.email = ["rubygems@joyent.com"]
+  s.homepage = "https://github.com/joyent/knife-joyent"
   s.summary = "Joyent CloudAPI Support for Chef's Knife Command"
   s.description = s.summary
+  s.license = "Apache 2.0"
   s.extra_rdoc_files = ["README.md", "LICENSE"]
 
   s.files         = `git ls-files`.split("\n")
@@ -20,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", '~> 1.23'
   s.add_dependency "multi_json", "~> 1.7"
   s.add_dependency "joyent-cloud-pricing", ">= 1.1.0"
-  s.add_dependency 'chef', '>= 11.16.2', '< 12.1'
+  s.add_dependency 'chef', '>= 11.16.2', '< 13'
   s.add_development_dependency 'rspec'
 
   s.require_paths = ["lib"]

data/lib/chef/knife/joyent_server_create.rb

@@ -272,7 +272,7 @@ class Chef
       end
 
       # src: https://github.com/chef/knife-ec2/blob/master/lib/chef/knife/ec2_server_create.rb#L741-L770
-      def determine_ssh_gateway
+      def determine_ssh_gateway(hostname)
         # ssh_gateway config takes precedence over derived value
         if config[:ssh_gateway]
           Chef::Log.debug("Using ssh gateway #{config[:ssh_gateway]} from knife config")

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.4.12"
+  VERSION = "0.4.14"
 end

metadata

@@ -1,102 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.14
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.23'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: joyent-cloud-pricing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 11.16.2
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 11.16.2
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Joyent CloudAPI Support for Chef's Knife Command
 email:
-- kevin@joyent.com
+- rubygems@joyent.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -139,8 +139,9 @@ files:
 - lib/knife-joyent/fw.rb
 - lib/knife-joyent/version.rb
 - spec/spec_helper.rb
-homepage: https://github.com/kevinykchan/knife-joyent
-licenses: []
+homepage: https://github.com/joyent/knife-joyent
+licenses:
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -148,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Joyent CloudAPI Support for Chef's Knife Command