knife-zcloudjp 0.1.7 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGNiZjA0ODE1NjAwMzI1Y2NkYmQ0NGFjZGRjNmYzNDkyYWEwYjFjYw==
-  data.tar.gz: !binary |-
-    MzVjZjJmNDhjNTE0NGIzMWY5YWQzM2M5OWE4ZTcxMzY3NjNlYzdjZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDhhOTRhM2QyMjVhOTg3YjQ5ZGJiNzg4ODYxZGVhMmE2OWJkOGFhZDhhMTIx
-    NzQ1NWZjZTVhYWYyYjMxZWYwNTA3ODg4Mzk1MDU4OTVhZTRjNjU5ZTU0NzVi
-    MWJkYTkwMzhlZDQ4N2U5N2I3NTcwYzNmMDQzOWQzM2JjOTdmMzQ=
-  data.tar.gz: !binary |-
-    ZGM3MjYyYmY1ODFjMTMzNDQyOGI2MWJlZDVlNGJkYjc0MzZlZTRiYzBhYzEz
-    M2U0YTg1MzUxZmQxMzY1NmYzZTUxZTI5YzRlMmJlNjMwOGUwYWU4NGYwNzk1
-    Y2YwMGNiNzI0OWNiMjA5M2NiYThhY2VkY2ExY2MzYTQ4ZWQyOWE=
+SHA1:
+  metadata.gz: e2906cbd29a2d2f0105328a6f82ee1cc46eb9b89
+  data.tar.gz: 9620762297555596cdc0d7c810a00e299cbf66ef
+SHA512:
+  metadata.gz: 2ed63d8c94cdf6bed38bc9777ce1de81487b3ca5ce96405afe67dd7b3893e3d7ad262d0f95b18d43b45638883a65fb6ccf253edfb7ea418f01b615ac1b639785
+  data.tar.gz: 5ed24dc07fccac8ba324f2b24d039fe1540e740a275d5f4ae0ea862a7b2ff75af490121a9f877650530772e6cbc783d06a9474375831e37d470255b10a484781

data/.gitignore

@@ -16,5 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 .chef/
-*.swp
+*.sw[a-z]
+.rvmrc
 vendor/

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-  - ree
-#  - jruby-19mode
-  - rbx-19mode
+  - 2.0.0
+  - 2.1.0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ChangeLog for knife-zcloudjp
 ====
 
+## v0.2.0
+
+* Renewal depend gems
+  * use 'zcloudjp' Gem for API Call. HT: @azukiwasher
+
+
 ## v0.1.7
 
 * Bugfix: cant retreve own version

data/README.md

@@ -4,6 +4,13 @@
 
 A Knife(Opscode Chef) plugin for [Z Cloud](http://z-cloud.jp). This plugin allows you to retrieve product catalog, print the current machines and bootstrap a machine.
 
+## F.Y.I
+
+SmartOS Bootstrap template is here.
+
+[higanworks/knife-bootstrap-smartos](https://github.com/higanworks/knife-bootstrap-smartos)
+
+
 ## Installation
 
 ### from Rubygems
@@ -29,35 +36,70 @@ Add the following entries to your `.chef/knife.rb`.
 
 ### Retrieve the product catalog that are currently available.
 
-    $ knife zcloudjp product list (options)
-    name                   os            dataset                     package   
-    MySQL Small 1          SmartOS       sdc:sdc:mysql:1.4.1         Small_1GB 
-    MySQL Large 1          SmartOS       sdc:sdc:mysql:1.4.1         Large_8GB 
-    Ubuntu Small 1         Ubuntu 10.04  sdc:sdc:ubuntu10.04:0.1.0   Small_1GB 
-    Ubuntu Large 8         Ubuntu 10.04  sdc:sdc:ubuntu10.04:0.1.0   Large_8GB 
-    CentOS Small 1         CentOS 5.7    sdc:jpc:centos-5.7:1.3.0    Small_1GB 
-    CentOS Large 8         CentOS 5.7    sdc:jpc:centos-5.7:1.3.0    Large_8GB 
-    Fedora Small 1         Fedora 14     sdc:sdc:fedora-14:1.0.1     Small_1GB 
-    Fedora Large 8         Fedora 14     sdc:sdc:fedora-14:1.0.1     Large_8GB 
-    Node.js Small 1        SmartOS       sdc:sdc:nodejs:1.4.0        Small_1GB 
-    Node.js Large 8        SmartOS       sdc:sdc:nodejs:1.4.0        Large_8GB 
-    Percona Small 1        SmartOS       sdc:sdc:percona:1.6.0       Small_1GB 
-    Percona Large 8        SmartOS       sdc:sdc:percona:1.6.0       Large_8GB 
-    Riak Small 1           SmartOS       sdc:sdc:riak:1.6.1          Small_1GB 
-    Riak Large 1           SmartOS       sdc:sdc:riak:1.6.1          Large_8GB 
-    SmartOS Small 1        SmartOS       sdc:sdc:base64:1.8.4        Small_1GB 
-    SmartOS Large 8        SmartOS       sdc:sdc:base64:1.8.4        Large_8GB 
-    CentOS Small 1         CentOS 6.0    sdc:jpc:centos-6:1.3.0      Small_1GB 
-    CentOS Large 8         CentOS 6.0    sdc:jpc:centos-6:1.3.0      Large_8GB 
-    Debian Small 1         Debian 6.0.3  sdc:sdc:debian-6.03:1.0.0   Small_1GB 
-    Debian Large 8         Debian 6.0.3  sdc:sdc:debian-6.03:1.0.0   Large_8GB 
-    SmartOS Plus Small 1   SmartOS       sdc:sdc:standard:1.0.7      Small_1GB 
-    SmartOS Plus Large 8   SmartOS       sdc:sdc:standard:1.0.7      Large_8GB 
-    Ubuntu Small 1         Ubuntu 12.04  sdc:jpc:ubuntu-12.04:2.2.1  Small_1GB 
-    Ubuntu Medium 8        Ubuntu 12.04  sdc:jpc:ubuntu-12.04:2.2.1  Large_8GB 
-    MongoDB Small 1        SmartOS       sdc:sdc:mongodb:1.4.0       Small_1GB 
-    MongoDB Large 8        SmartOS       sdc:sdc:mongodb:1.4.0       Large_8GB 
-
+```
+$ knife zcloudjp product list (options)
+name                   os            dataset                     package   
+MySQL Small 1          SmartOS       sdc:sdc:mysql:1.4.1         Small_1GB 
+MySQL Medium 2         SmartOS       sdc:sdc:mysql:1.4.1         Medium_2GB
+MySQL Medium 4         SmartOS       sdc:sdc:mysql:1.4.1         Medium_4GB
+MySQL Large 1          SmartOS       sdc:sdc:mysql:1.4.1         Large_8GB 
+Fedora Small 1         Fedora 14     sdc:sdc:fedora-14:1.0.1     Small_1GB 
+Fedora Medium 2        Fedora 14     sdc:sdc:fedora-14:1.0.1     Medium_2GB
+Fedora Medium 4        Fedora 14     sdc:sdc:fedora-14:1.0.1     Medium_4GB
+Fedora Large 8         Fedora 14     sdc:sdc:fedora-14:1.0.1     Large_8GB 
+CentOS Small 1         CentOS 5.7    sdc:jpc:centos-5.7:1.3.0    Small_1GB 
+CentOS Medium 2        CentOS 5.7    sdc:jpc:centos-5.7:1.3.0    Medium_2GB
+CentOS Medium 4        CentOS 5.7    sdc:jpc:centos-5.7:1.3.0    Medium_4GB
+CentOS Large 8         CentOS 5.7    sdc:jpc:centos-5.7:1.3.0    Large_8GB 
+Ubuntu Small 1         Ubuntu 10.04  sdc:sdc:ubuntu10.04:0.1.0   Small_1GB 
+Ubuntu Medium 2        Ubuntu 10.04  sdc:sdc:ubuntu10.04:0.1.0   Medium_2GB
+Ubuntu Medium 4        Ubuntu 10.04  sdc:sdc:ubuntu10.04:0.1.0   Medium_4GB
+Ubuntu Large 8         Ubuntu 10.04  sdc:sdc:ubuntu10.04:0.1.0   Large_8GB 
+SmartOS Plus Small 1   SmartOS       sdc:sdc:standard:1.0.7      Small_1GB 
+SmartOS Plus Medium 2  SmartOS       sdc:sdc:standard:1.0.7      Medium_2GB
+SmartOS Plus Medium 4  SmartOS       sdc:sdc:standard:1.0.7      Medium_4GB
+SmartOS Plus Large 8   SmartOS       sdc:sdc:standard:1.0.7      Large_8GB 
+Hadoop Small 1         SmartOS       sdc:sdc:hadoop:1.0.0        Small_1GB 
+Hadoop Medium 2        SmartOS       sdc:sdc:hadoop:1.0.0        Medium_2GB
+Hadoop Medium 4        SmartOS       sdc:sdc:hadoop:1.0.0        Medium_4GB
+Hadoop Large 8         SmartOS       sdc:sdc:hadoop:1.0.0        Large_8GB 
+Chef Server Small 1    SmartOS       sdc:sdc:chefserver:1.0.0    Small_1GB 
+Chef Server Medium 2   SmartOS       sdc:sdc:chefserver:1.0.0    Medium_2GB
+Chef Server Medium 4   SmartOS       sdc:sdc:chefserver:1.0.0    Medium_4GB
+Chef Server Large 8    SmartOS       sdc:sdc:chefserver:1.0.0    Large_8GB 
+Ubuntu Small 1         Ubuntu 12.04  sdc:jpc:ubuntu-12.04:2.4.1  Small_1GB 
+Ubuntu Medium 2        Ubuntu 12.04  sdc:jpc:ubuntu-12.04:2.4.1  Medium_2GB
+Ubuntu Medium 4        Ubuntu 12.04  sdc:jpc:ubuntu-12.04:2.4.1  Medium_4GB
+Ubuntu Medium 8        Ubuntu 12.04  sdc:jpc:ubuntu-12.04:2.4.1  Large_8GB 
+Debian Small 1         Debian 6.0.7  sdc:sdc:debian-6.0.7:2.4.1  Small_1GB 
+Debian Medium 2        Debian 6.0.7  sdc:sdc:debian-6.0.7:2.4.1  Medium_2GB
+Debian Medium 4        Debian 6.0.7  sdc:sdc:debian-6.0.7:2.4.1  Medium_4GB
+Debian Large 8         Debian 6.0.7  sdc:sdc:debian-6.0.7:2.4.1  Large_8GB 
+SmartOS Small 1        SmartOS       sdc:sdc:base64:13.1.0       Small_1GB 
+SmartOS Medium 2       SmartOS       sdc:sdc:base64:13.1.0       Medium_2GB
+SmartOS Medium 4       SmartOS       sdc:sdc:base64:13.1.0       Medium_4GB
+SmartOS Large 8        SmartOS       sdc:sdc:base64:13.1.0       Large_8GB 
+MongoDB Small 1        SmartOS       sdc:sdc:mongodb:1.4.5       Small_1GB 
+MongoDB Medium 2       SmartOS       sdc:sdc:mongodb:1.4.5       Medium_2GB
+MongoDB Medium 4       SmartOS       sdc:sdc:mongodb:1.4.5       Medium_4GB
+MongoDB Large 8        SmartOS       sdc:sdc:mongodb:1.4.5       Large_8GB 
+Node.js Small 1        SmartOS       sdc:sdc:nodejs:13.1.0       Small_1GB 
+Node.js Medium 2       SmartOS       sdc:sdc:nodejs:13.1.0       Medium_2GB
+Node.js Medium 4       SmartOS       sdc:sdc:nodejs:13.1.0       Medium_4GB
+Node.js Large 8        SmartOS       sdc:sdc:nodejs:13.1.0       Large_8GB 
+Percona Small 1        SmartOS       sdc:sdc:percona:13.1.0      Small_1GB 
+Percona Medium 2       SmartOS       sdc:sdc:percona:13.1.0      Medium_2GB
+Percona Medium 4       SmartOS       sdc:sdc:percona:13.1.0      Medium_4GB
+Percona Large 8        SmartOS       sdc:sdc:percona:13.1.0      Large_8GB 
+Riak Small 1           SmartOS       sdc:sdc:riak:13.1.0         Small_1GB 
+Riak Medium 2          SmartOS       sdc:sdc:riak:13.1.0         Medium_2GB
+Riak Medium 4          SmartOS       sdc:sdc:riak:13.1.0         Medium_4GB
+Riak Large 1           SmartOS       sdc:sdc:riak:13.1.0         Large_8GB 
+CentOS Small 1         CentOS 6.4    sdc:sdc:centos-6:2.4.1      Small_1GB 
+CentOS Medium 2        CentOS 6.4    sdc:sdc:centos-6:2.4.1      Medium_2GB
+CentOS Medium 4        CentOS 6.4    sdc:sdc:centos-6:2.4.1      Medium_4GB
+CentOS Large 8         CentOS 6.4    sdc:sdc:centos-6:2.4.1      Large_8GB 
+```
 
 
 <pre><code>knife zcloudjp product list (options)

data/Rakefile

@@ -2,8 +2,8 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require 'rubygems'
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-require 'yard'
 
 desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -11,8 +11,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
 end
 
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
-end
-
 task :default => [:spec]

data/knife-zcloudjp.gemspec

@@ -16,10 +16,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "chef", ">= 0.10.10"
-  s.add_dependency "faraday"
+  s.add_dependency "zcloudjp"
+  s.add_dependency "formatador"
 
   s.add_development_dependency("rspec", [">= 2.2.0"])
-  s.add_development_dependency("yard", [">= 0.5.8"])
-  s.add_development_dependency("fuubar", [">= 0.0.1"])
   s.add_development_dependency("rake")
+  s.add_development_dependency("fuubar")
+  s.add_development_dependency("pry")
+  s.add_development_dependency("pry-doc")
+  s.add_development_dependency("cane")
 end

data/lib/chef/knife/zcloudjp_base.rb

@@ -10,9 +10,8 @@ class Chef
 
           deps do
             require 'net/ssh/multi'
-            require 'readline'
+            require 'zcloudjp'
             require 'chef/json_compat'
-            require 'faraday'
           end
 
           option :zcloudjp_api_token,
@@ -31,10 +30,8 @@ class Chef
 
     private
 
-      def connection
-        @connection = Faraday.new(:url => Chef::Config[:knife][:zcloudjp_api_url]) do |faraday|
-          faraday.request  :url_encoded
-        end
+      def client
+        Zcloudjp::Client.new(:api_key => Chef::Config[:knife][:zcloudjp_api_token])
       end
 
       def locate_config_value(key)

data/lib/chef/knife/zcloudjp_machine_create.rb

@@ -8,10 +8,7 @@ class Chef
 
 
       deps do
-        require 'net/ssh/multi'
-        require 'readline'
         require 'chef/json_compat'
-        require 'faraday'
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
       end
@@ -136,27 +133,19 @@ class Chef
           ui.error("You have not provided a valid dataset image value. Please note the short option for this value recently changed from '-i' to '-I'.")
           exit 1
         end
-        body = Hash.new()
-        body["dataset"]   = config[:dataset]
-        body["package"]   = locate_config_value(:package)
-        body["name"]      = config[:chef_node_name]
-        body["locale"]      = "en"
+        options  = Hash.new()
+        options[:dataset]   = config[:dataset]
+        options[:package]   = locate_config_value(:package)
+        options[:name]      = config[:chef_node_name]
+        options[:locale]    = "en"
 
         Chef::Log.debug("Create machine with parameters below")
-        Chef::Log.debug(body)
-        
+        Chef::Log.debug(options)
+
 
         locate_config_value(:zcloudjp_api_url)
-        connection = Faraday.new(:url => locate_config_value(:zcloudjp_api_url), :ssl => {:verify => false}, :headers => {"User-Agent" => "Knife-Zcloudjp/#{::Knife::Zcloudjp::VERSION}"})
- 
-        response = connection.post do |req|
-          req.url '/machines.json'
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          req.body = body.to_json
-        end
 
-        machine = JSON.parse(response.body, :symbolized_names =>true )
+        machine = client.machine.create(options)
 
         msg_pair("ID", machine['id'])
         msg_pair("ip", machine['ips'].last)
@@ -179,7 +168,6 @@ class Chef
         # wait for provision the machine.
         print(".") until verify_ssh_connection(bootstrap_ip_address) {
           sleep @initial_sleep_delay ||= 10
-          # puts("done")
         }
 
         # for smartdc workaround. check twice.
@@ -192,15 +180,16 @@ class Chef
         }
 
         # add name tag for zcloud machine
+        # sdc has bug. should update manualy..
         body = Hash.new()
         body["value"]   = config[:machine_name]
-
-        response = connection.put do |req|
-          req.url "/machines/#{machine['id']}/name"
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          req.body = body.to_json
-        end
+        HTTParty.put(
+          "#{Chef::Config[:knife][:zcloudjp_api_url]}/machines/#{machine['id']}/name",
+          :headers => {
+            "X-API-KEY" => Chef::Config[:knife][:zcloudjp_api_token]
+            },
+           :body => body
+        )
 
         bootstrap_node(machine, bootstrap_ip_address).run
       end
@@ -211,7 +200,6 @@ class Chef
         bootstrap.config[:run_list] = config[:run_list]
         bootstrap.config[:first_boot_attributes] = config[:first_boot_attributes]
         bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
-        # bootstrap.config[:ssh_password] = machine.password
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:host_key_verify] = config[:host_key_verify]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id

data/lib/chef/knife/zcloudjp_machine_list.rb

@@ -10,14 +10,6 @@ class Chef
       def run
         Chef::Log.debug("Connect to Z Cloud API #{locate_config_value(:zcloudjp_api_url)}")
 
-        connection = Faraday.new(:url => locate_config_value(:zcloudjp_api_url), :ssl => {:verify => false}, :headers => {"User-Agent" => "Knife-Zcloudjp/#{::Knife::Zcloudjp::VERSION}"})
-
-        response = connection.get do |req|
-          req.url '/machines.json'
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-        end
-
         machine_list = [
           ui.color('name', :bold),
           ui.color('id', :bold),
@@ -27,7 +19,7 @@ class Chef
           ui.color('state', :bold),
         ]
 
-        machines = JSON.parse(response.body)
+        machines = client.machine.list
 
         machines.map do |machine|
           machine_list << machine["name"].to_s

data/lib/chef/knife/zcloudjp_machine_start.rb

@@ -8,10 +8,7 @@ class Chef
 
 
       deps do
-        require 'net/ssh/multi'
-        require 'readline'
         require 'chef/json_compat'
-        require 'faraday'
       end
 
       option :machine_uuid,
@@ -28,8 +25,8 @@ class Chef
       option :timeout,
         :short => "-t TIMEOUT_SECONDS",
         :long => "--timeout USERNAME",
-        :description => "Set Timeout(seconds). default value is 10.",
-        :default => 10
+        :description => "Set Timeout(seconds). default value is 20.",
+        :default => 20
 
       def run
         $stdout.sync = true
@@ -38,75 +35,44 @@ class Chef
           ui.error("You have not provided a machine uuid. Please note the short option for this value is '-n'.")
           exit 1
         end
-        body = Hash.new()
 
         Chef::Log.debug("Start machine.")
-        Chef::Log.debug(body)
-        
 
-        locate_config_value(:zcloudjp_api_url)
-        connection = Faraday.new(:url => locate_config_value(:zcloudjp_api_url), :ssl => {:verify => false}, :headers => {"User-Agent" => "Knife-Zcloudjp/#{::Knife::Zcloudjp::VERSION}"})
- 
-        def check_current_state(connection,machine_uuid)
-          response = connection.get do |req|
-            req.url "/machines/#{machine_uuid}.json"
-            req.headers['Content-Type'] = 'application/json'
-            req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          end
 
-          Chef::Log.debug(response.inspect)
-          case response.status
-          when 200
-            # do nothing.
-          when 404
-            ui.warn("The machine #{config[:machine_uuid]} was not found.")
-            exit
-          else
-            ui.fatal("Exit", "Unknown Error occured in API response.")
-            exit
-          end
+        locate_config_value(:zcloudjp_api_url)
+        machine = client.machine.show(:id => config[:machine_uuid])
 
-          machine = JSON.parse(response.body, :symbolized_names =>true )
-          machine['state']
+        ## Exit if missing
+        if machine[:error]
+          ui.warn("The machine #{config[:machine_uuid]} was not found.")
+          exit
         end
 
-        ## Exit if already runnning.
-        if check_current_state(connection, config[:machine_uuid]) == "running" then
+        ## Exit if already running.
+        if machine[:state] == "running" then
           ui.info("The machine #{config[:machine_uuid]} is already running.")
           exit
         end
 
         # Start Machine
-        response = connection.post do |req|
-          req.url "/machines/#{config[:machine_uuid]}/start.json"
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          req.body = body.to_json
-        end
+        machine.start
 
         ## Wait
         ui.info("Waiting state of machine changed to running... (Timeout: #{config[:timeout]} seconds)")
         config[:timeout].to_i.times do |idx|
-          if check_current_state(connection, config[:machine_uuid]) == "running" then
+          if machine.reload[:state] == "running" then
+            puts ''
             break
-          elsif (idx + 1) == config[:timeout].to_i
+          elsif (idx + 2) == config[:timeout].to_i
             ui.warn("Timed out. Please check later.")
             exit 1
           else
-              sleep 1
+            print '.'
+            sleep 2
           end
         end
 
         ## print current status
-        response = connection.get do |req|
-          req.url "/machines/#{config[:machine_uuid]}.json"
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          req.body = body.to_json
-        end
-
-        machine = JSON.parse(response.body, :symbolized_names =>true )
-
         msg_pair("ID", machine['id'])
         msg_pair("ip", machine['ips'].last)
         msg_pair("type", machine['type'])

data/lib/chef/knife/zcloudjp_machine_stop.rb

@@ -8,10 +8,7 @@ class Chef
 
 
       deps do
-        require 'net/ssh/multi'
-        require 'readline'
         require 'chef/json_compat'
-        require 'faraday'
       end
 
       option :machine_uuid,
@@ -28,8 +25,8 @@ class Chef
       option :timeout,
         :short => "-t TIMEOUT_SECONDS",
         :long => "--timeout USERNAME",
-        :description => "Set Timeout(seconds). default value is 10.",
-        :default => 10
+        :description => "Set Timeout(seconds). default value is 20.",
+        :default => 20
 
       def run
         $stdout.sync = true
@@ -38,75 +35,43 @@ class Chef
           ui.error("You have not provided a machine uuid. Please note the short option for this value is '-n'.")
           exit 1
         end
-        body = Hash.new()
 
         Chef::Log.debug("Stop machine.")
-        Chef::Log.debug(body)
-        
 
         locate_config_value(:zcloudjp_api_url)
-        connection = Faraday.new(:url => locate_config_value(:zcloudjp_api_url), :ssl => {:verify => false}, :headers => {"User-Agent" => "Knife-Zcloudjp/#{::Knife::Zcloudjp::VERSION}"})
- 
-        def check_current_state(connection,machine_uuid)
-          response = connection.get do |req|
-            req.url "/machines/#{machine_uuid}.json"
-            req.headers['Content-Type'] = 'application/json'
-            req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          end
+        machine = client.machine.show(:id => config[:machine_uuid])
 
-          Chef::Log.debug(response.inspect)
-          case response.status
-          when 200
-            # do nothing.
-          when 404
-            ui.warn("The machine #{config[:machine_uuid]} was not found.")
-            exit
-          else
-            ui.fatal("Exit", "Unknown Error occured in API response.")
-            exit
-          end
-
-          machine = JSON.parse(response.body, :symbolized_names =>true )
-          machine['state']
+        ## Exit if missing
+        if machine[:error]
+          ui.warn("The machine #{config[:machine_uuid]} was not found.")
+          exit
         end
 
         ## Exit if already stopped.
-        if check_current_state(connection, config[:machine_uuid]) == "stopped" then
+        if machine[:state] == "stopped" then
           ui.info("The machine #{config[:machine_uuid]} already stopped.")
           exit
         end
 
         # Stop Machine
-        response = connection.post do |req|
-          req.url "/machines/#{config[:machine_uuid]}/stop.json"
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          req.body = body.to_json
-        end
+        machine.stop
 
         ## Wait
         ui.info("Waiting state of machine changed to stopped... (Timeout: #{config[:timeout]} seconds)")
         config[:timeout].to_i.times do |idx|
-          if check_current_state(connection, config[:machine_uuid]) == "stopped" then
+          if machine.reload[:state] == "stopped" then
+            puts ''
             break
-          elsif (idx + 1) == config[:timeout].to_i
+          elsif (idx + 2) == config[:timeout].to_i
             ui.warn("Timed out. Please check later.")
             exit 1
           else
-              sleep 1
+            print '.'
+            sleep 2
           end
         end
 
         ## print current status
-        response = connection.get do |req|
-          req.url "/machines/#{config[:machine_uuid]}.json"
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-          req.body = body.to_json
-        end
-
-        machine = JSON.parse(response.body, :symbolized_names =>true )
-
         msg_pair("ID", machine['id'])
         msg_pair("ip", machine['ips'].last)
         msg_pair("type", machine['type'])

data/lib/chef/knife/zcloudjp_product_list.rb

@@ -10,13 +10,11 @@ class Chef
 
       def run
         Chef::Log.debug("Connect to Z Cloud API #{locate_config_value(:zcloudjp_api_url)}")
-        connection = Faraday.new(:url => locate_config_value(:zcloudjp_api_url), :ssl => {:verify => false}, :headers => {"User-Agent" => "Knife-Zcloudjp/#{::Knife::Zcloudjp::VERSION}"})
 
-        response = connection.get do |req|
-          req.url '/products.json'
-          req.headers['Content-Type'] = 'application/json'
-          req.headers['X-API-KEY'] = Chef::Config[:knife][:zcloudjp_api_token]
-        end
+        response = HTTParty.get(
+                     "#{Chef::Config[:knife][:zcloudjp_api_url]}/products.json",
+                     :headers => {"X-API-KEY" => Chef::Config[:knife][:zcloudjp_api_token]}
+                   )
 
         products = JSON.parse(response.body)
 

data/lib/knife-zcloudjp.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zcloudjp
-    VERSION = "0.1.7"
+    VERSION = "0.2.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,97 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: knife-zcloudjp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: zcloudjp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  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'
+- !ruby/object:Gem::Dependency
+  name: cane
   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: Knife(Opscode Chef) plugin for Z Cloud(Powered by Joyent).
@@ -132,17 +174,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.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Knife(Opscode Chef) plugin for Z Cloud(Powered by Joyent).