vagrant-simplecloud 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9a4564941ef8ce9b473405f36bf0662c7642b9
-  data.tar.gz: a16b8b5ea3051cb949c783d552f32a2b83873d99
+  metadata.gz: 1747f26a1363d6a480ab95dbe76eca402d220244
+  data.tar.gz: d0e56b5a130f84efac577a98b83cc1cf0dc8443b
 SHA512:
-  metadata.gz: 653be2c3117f57c4acbc89f35a75a83a76749c89736102819d5a1bfbf816570426682b5ad26f636e129e48ed8ed8a2e51265723c1cf36cae811ac70e6fd0915b
-  data.tar.gz: 695217d7c25b73c41d565544703e6a849649be4b4f35cc9fda6a26862e8337fc6652d49ab9ca616852cbd8f655a2c1b28c8dd0a8d4929da43bd45507b717020c
+  metadata.gz: ddf115270f85be9f4e5bef934b6822504494290e50f4a6bfcc2a6aa561cce87bab864e38e2923d52fc7f26aa336da3b0a7bf9f3c7c79bf526459542f25140d99
+  data.tar.gz: 851dd9518b0bd49ae3c406a2cd04134732a5e8ab8364a6ac319f3738d2848f8193ea44a0f205b6125c92be9494a958d39d8a2068e5fbf3aa19f37cff5634744c

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.0.5
+-----
+- remove dropletkit dependence
+
 0.0.2
 -----
 - first version that pass test

data/lib/vagrant-simplecloud/actions/create.rb

@@ -10,7 +10,6 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::create')
         end
@@ -19,16 +18,16 @@ module VagrantPlugins
           ssh_key_id = [env[:ssh_key_id]]
 
           # submit new droplet request
-          droplet = DropletKit::Droplet.new(name: @machine.config.vm.hostname || @machine.name, \
-                                            region: @machine.provider_config.region,\
-                                            size: @machine.provider_config.size, image: @machine.provider_config.image)
-          result = JSON.parse(@simple_client.droplets.create(droplet))
+          result = @simple_client.post("/v2/droplets", {:name => @machine.config.vm.hostname || @machine.name, \
+                                            :region => @machine.provider_config.region,\
+                                            :size => @machine.provider_config.size, \
+                                            :image => @machine.provider_config.image})
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_simple_cloud.info.creating')
 
           raise 'droplet not ready, no actions_ids' unless result['droplet'].has_key?('action_ids')
-          @client.wait_for_event(env, result['droplet']['action_ids'].first)
+          @simple_client.wait_for_event(env, result['droplet']['action_ids'].first)
 
           # assign the machine id for reference in other commands
           @machine.id = result['droplet']['id'].to_s

data/lib/vagrant-simplecloud/actions/destroy.rb

@@ -9,15 +9,13 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::destroy')
         end
 
         def call(env)
           # submit destroy droplet request
-          @simple_client.droplets.delete(id: @machine.id)
-          #@client.delete("/v2/droplets/#{@machine.id}")
+          @simple_client.delete("/v2/droplets/#{@machine.id}")
 
           env[:ui].info I18n.t('vagrant_simple_cloud.info.destroying')
 

data/lib/vagrant-simplecloud/actions/power_off.rb

@@ -9,7 +9,6 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::power_off')
         end
@@ -20,7 +19,7 @@ module VagrantPlugins
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_simple_cloud.info.powering_off')
-          @client.wait_for_event(env, result['action']['id'])
+          @simple_client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-simplecloud/actions/power_on.rb

@@ -9,7 +9,6 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::power_on')
         end
@@ -20,7 +19,7 @@ module VagrantPlugins
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_simple_cloud.info.powering_on')
-          @client.wait_for_event(env, result['action']['id'])
+          @simple_client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-simplecloud/actions/rebuild.rb

@@ -10,28 +10,24 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::rebuild')
         end
 
         def call(env)
-          # look up image id
-          image_id = @simple_client.images.find(id: @machine.provider_config.image).id
+            # look up image id
+            image_id = @simple_client.request('/v2/images').fetch('images').select \
+                        {|a| a['slug'] == @machine.provider_config.image}.first['id']
 
           # submit rebuild request
           result = @simple_client.post("/v2/droplets/#{@machine.id}/actions", {
             :type => 'rebuild',
             :image => image_id
           })
-          # simple cloud api has not return region_slug in response
-          #image_id = @simple_client.images.find(id: @machine.provider_config.image).id
-          #env[:ui].info "#{@machine.id.to_s}, #{image_id}"
-          #result = JSON.parse(@simple_client.droplet_actions.rebuild(droplet_id: @machine.id, image: image_id))
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_simple_cloud.info.rebuilding')
-          @client.wait_for_event(env, result['action']['id'])
+          @simple_client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-simplecloud/actions/reload.rb

@@ -9,7 +9,6 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::reload')
         end
@@ -20,7 +19,7 @@ module VagrantPlugins
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_simple_cloud.info.reloading')
-          @client.wait_for_event(env, result['action']['id'])
+          @simple_client.wait_for_event(env, result['action']['id'])
 
           @app.call(env)
         end

data/lib/vagrant-simplecloud/actions/setup_key.rb

@@ -9,7 +9,6 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::setup_key')
         end
@@ -18,17 +17,14 @@ module VagrantPlugins
         def call(env)
             ssh_key_name = @machine.provider_config.ssh_key_name
             # assigns existing ssh key id to env for use by other commands
-            @simple_client.ssh_keys.all().each do |key|
-                if key["name"] == ssh_key_name
-                    env[:ssh_key_id] = key["id"]
-                    env[:ui].info I18n.t('vagrant_simple_cloud.info.using_key', {
-                      :name => ssh_key_name
-                    })
-                    @app.call(env)
-                    return
-                end
+            res = @simple_client.request('/v2/account/keys')
+            key_data = res.fetch('ssh_keys').select {|a| a['name'] == ssh_key_name}.first
+            if key_data.nil?
+                env[:ssh_key_id] = create_ssh_key(ssh_key_name, env)
+            else
+                env[:ssh_key_id] = key_data['id']
             end
-            env[:ssh_key_id] = create_ssh_key(ssh_key_name, env)
+            env[:ui].info I18n.t('vagrant_simple_cloud.info.using_key', {:name => ssh_key_name})
             @app.call(env)
         end
 
@@ -40,12 +36,16 @@ module VagrantPlugins
           path = path[0] if path.is_a?(Array)
           path = File.expand_path(path, @machine.env.root_path)
           pub_key = SimpleCloud.public_key(path)
-          ssh_key = DropletKit::SSHKey.new(name: name, public_key: pub_key)
-          result = @simple_client.ssh_keys.create(ssh_key)
+
           env[:ui].info I18n.t('vagrant_simple_cloud.info.creating_key', {
             :name => name
           })
-          result.id
+
+          result = @simple_client.post('/v2/account/keys', {
+            :name => name,
+            :public_key => pub_key
+          })
+          result['ssh_key']['id']
         end
       end
     end

data/lib/vagrant-simplecloud/actions/shut_down.rb

@@ -9,7 +9,6 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @simple_client = simple_client
           @logger = Log4r::Logger.new('vagrant::simplecloud::shut_down')
         end
@@ -20,8 +19,7 @@ module VagrantPlugins
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_simple_cloud.info.shutting_down')
-          #@client.wait_for_event(env, result['droplet']['event_id'])
-          @client.wait_for_event(env, result['action']['id'])
+          @simple_client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-simplecloud/helpers/client.rb

@@ -1,7 +1,6 @@
 require 'vagrant-simplecloud/helpers/result'
 require 'faraday'
 require 'json'
-require 'droplet_kit'
 require 'uri'
 require 'net/http'
 require 'net/https'
@@ -10,141 +9,62 @@ module VagrantPlugins
   module SimpleCloud
     module Helpers
       module Client
-        def client
-          @client ||= ApiClient.new(@machine)
-        end
         def simple_client
-          @simple_client ||= SimpleClient.new(access_token: @machine.provider_config.token)
+          @simple_client ||= SimpleClient.new(@machine)
         end
       end
-      class SimpleClient < DropletKit::Client
+      class SimpleClient
           include Vagrant::Util::Retryable
 
+          def initialize(machine)
+            @logger = Log4r::Logger.new('vagrant::simplecloud::apiclient')
+            @config = machine.provider_config
+            @url = "https://api.simplecloud.ru"
+          end
+
+          def delete(path, params = {})
+              self.request(path, params, :delete)
+          end
+
           def post(path, params = {})
-                uri = URI.parse("#{connection_options[:url]}#{path}")
+              self.request(path, params, :post)
+          end
+
+          def request(path, params = {}, method = :get)
+                @logger.info "Request: #{@url}#{path} #{params}"
+                uri = URI.parse("#{@url}#{path}")
                 https = Net::HTTP.new(uri.host,uri.port)
                 https.use_ssl = true
-                req = Net::HTTP::Post.new(uri.path)
-                req['Content-Type'] = connection_options[:headers][:content_type]
-                req['Authorization'] = connection_options[:headers][:authorization]
+                req = case method
+                    when :get
+                        Net::HTTP::Get.new(uri.path)
+                    when :post
+                        Net::HTTP::Post.new(uri.path)
+                    when :delete
+                        Net::HTTP::Delete.new(uri.path)
+                end
+                req['Content-Type'] = "application/json"
+                req['Authorization'] = "Bearer #{@config.token}"
                 req.set_form_data(params)
                 res = https.request(req)
                 unless /^2\d\d$/ =~ res.code.to_s
                   raise "Server response error #{res.code} #{path} #{params} #{res.message} #{res.body}"
                 end
-                JSON.parse(res.body)
+                JSON.parse(res.body) unless res.body.nil?
           end
 
           def wait_for_event(env, id)
             retryable(:tries => 120, :sleep => 10) do
               # stop waiting if interrupted
               next if env[:interrupted]
-              # check action status
-              result = self.actions.find(id: id)
-              yield result if block_given?
-              raise 'not ready' if result.status != 'completed'
-            end
-          end
-
-          private
-          def connection_options
-              {
-                  url: "https://api.simplecloud.ru",
-                  headers: {
-                      content_type: 'application/json',
-                      authorization: "Bearer #{access_token}"
-                      }
-              }
-          end
-      end
-      class ApiClient
-        include Vagrant::Util::Retryable
-
-        def initialize(machine)
-          @logger = Log4r::Logger.new('vagrant::simplecloud::apiclient')
-          @config = machine.provider_config
-          @client = Faraday.new({
-            :url => 'https://api.simplecloud.ru/',
-            :ssl => {
-              :ca_file => @config.ca_path
-            }
-          })
-        end
-
-        def delete(path, params = {}, method = :delete)
-          @client.request :url_encoded
-          request(path, params, :delete)
-        end
-
-        def post(path, params = {}, method = :post)
-          @client.headers['Content-Type'] = 'application/json'
-          request(path, params, :post)
-        end
 
-        def request(path, params = {}, method = :get)
-          begin
-            @logger.info "Request: #{path} #{params}"
-            result = @client.send(method) do |req|
-              req.url path, params
-              req.headers['Authorization'] = "Bearer #{@config.token}"
-            end
-          rescue Faraday::Error::ConnectionFailed => e
-            # TODO this is suspect but because farady wraps the exception
-            #      in something generic there doesn't appear to be another
-            #      way to distinguish different connection errors :(
-            if e.message =~ /certificate verify failed/
-              raise Errors::CertificateError
-            end
-
-            raise e
-          end
+              # check action status
+              result = self.request("/v2/actions/#{id}")
 
-          unless method == :delete
-            begin
-              body = JSON.parse(result.body)
-              @logger.info "Response: #{body}"
-              next_page = body["links"]["pages"]["next"] rescue nil
-              unless next_page.nil?
-                uri = URI.parse(next_page)
-                new_path = path.split("?")[0]
-                next_result = self.request("#{new_path}?#{uri.query}")
-                req_target = new_path.split("/")[-1]
-                body["#{req_target}"].concat(next_result["#{req_target}"])
-              end
-            rescue JSON::ParserError => e
-              raise(Errors::JSONError, {
-                :message => e.message,
-                :path => path,
-                :params => params,
-                :response => result.body
-              })
+              yield result if block_given?
+              raise 'not ready' if result['action']['status'] != 'completed'
             end
           end
-
-          unless /^2\d\d$/ =~ result.status.to_s
-            raise(Errors::APIStatusError, {
-              :path => path,
-              :params => params,
-              :status => result.status,
-              :response => body.inspect
-            })
-          end
-
-          Result.new(body)
-        end
-
-        def wait_for_event(env, id)
-          retryable(:tries => 120, :sleep => 10) do
-            # stop waiting if interrupted
-            next if env[:interrupted]
-
-            # check action status
-            result = self.request("/v2/actions/#{id}")
-
-            yield result if block_given?
-            raise 'not ready' if result['action']['status'] != 'completed'
-          end
-        end
       end
     end
   end

data/lib/vagrant-simplecloud/provider.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       # the Simple Cloud account. A specific droplet's status
       # may be refreshed by passing :refresh => true as an option.
       def self.droplet(machine, opts = {})
-        client = Helpers::ApiClient.new(machine)
+        client = Helpers::SimpleClient.new(machine)
 
         # load status of droplets if it has not been done before
         if !@droplets

data/lib/vagrant-simplecloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SimpleCloud
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/test/test.sh

@@ -9,6 +9,7 @@ bundle _1.7.9_ exec vagrant provision
 bundle _1.7.9_ exec vagrant reload
 bundle _1.7.9_ exec vagrant rebuild
 bundle _1.7.9_ exec vagrant halt
+bundle _1.7.9_ exec vagrant up
 bundle _1.7.9_ exec vagrant destroy
 
 cd ..

data/vagrant-simplecloud.gemspec

@@ -18,5 +18,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "faraday", ">= 0.8.6"
   gem.add_dependency "json"
   gem.add_dependency "log4r"
-  gem.add_dependency "droplet_kit"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-simplecloud
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Bender
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: droplet_kit
-  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'
 description: Enables Vagrant to manage Simple Cloud droplets. Based on https://github.com/smdahlen/vagrant-digitalocean
 email:
 - vadikgo@gmail.com
@@ -134,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Simple Cloud droplets. Based on https://github.com/smdahlen/vagrant-digitalocean