fog-sakuracloud 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7acfddc20f9f0289fe48cc2f51d47b7730c03e52
-  data.tar.gz: 242cf21c04095f166e0369e8b138bdfab30cd4f9
+  metadata.gz: 2a76f70a4a79d0560762658616131d59e11a8dd2
+  data.tar.gz: f85a8f58dc6ef37c10ea7115be964b677f64a44e
 SHA512:
-  metadata.gz: 86b5ae14cb0dfc1d7a33652a86d0b9c677e6b59bc3a4f5de7f8251f894e02cc936139d83e183803d96085d842819f271a50c8a99286867453eb051dd14bbe71e
-  data.tar.gz: d8f8fe74132e2ad30ac4e3b66988132575fd2f537ee1bb6645874577276f998680a2eaeb41631212551a494d3fe044a71412047e6c451fd20d92a50219a47295
+  metadata.gz: d8a5575a01d508477e6a460aa85af7bee10175b0feba5f8a37605ccea86ef1bc09cf1e3fcd2433351b8204ab3097f81f0487791770c8f0a383823868b1bfb59a
+  data.tar.gz: 96a97d8528df9158fb97811b7515d6617efa5bb11eaa3382d9976772821a059eea41712ea7249cce512ee402c367c9d992e38e3e43381afefd6b0d16e84c7e27

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog of fog-sakuracloud
 
-## v1.0.0
+## v1.1.0
 
-- Issue:6 Depends only fog-core.
+- Feature: Support Install Script.
+
+## v1.0.1
+
+- #11 Using Relative paths.
 
 ## v0.1.2
 

data/lib/fog/sakuracloud.rb

@@ -21,8 +21,13 @@ module Fog
     SAKURACLOUD_API_ZONE = "is1b" unless defined? SAKURACLOUD_API_ZONE
     SAKURACLOUD_API_ENDPOINT = "/cloud/zone/#{SAKURACLOUD_API_ZONE}/api/cloud/#{SAKURACLOUD_API_VERSION}/"
 
+    # Miscs
+    ## Startup Script
+    autoload :Script,      File.expand_path('../sakuracloud/script', __FILE__)
+
     service(:compute, 'Compute')
-    service(:volume, 'Volume')
+    service(:volume,  'Volume')
     service(:network, 'Network')
+    service(:script,  'Script')
   end
 end

data/lib/fog/sakuracloud/models/compute/servers.rb

@@ -48,6 +48,7 @@ module Fog
             disk_attached?(server, disk.id)
             Fog::Logger.warning("Modifing disk")
             volume.configure_disk(disk.id, options[:sshkey])
+            volume.register_note_to_disk(disk.id, options[:startup_script]) if options[:startup_script]
             disk
         end
 

data/lib/fog/sakuracloud/models/script/note.rb

@@ -0,0 +1,39 @@
+require 'fog/core/model'
+
+module Fog
+  module SakuraCloud
+    class Script
+      class Note < Fog::Model
+        identity :id, :aliases => 'ID'
+        attribute :name, :aliases => 'Name'
+        attribute :note_class, :aliases => 'Class'
+        attribute :scope, :aliases => 'Scope'
+        attribute :content, :aliases => 'Content'
+        attribute :description, :aliases => 'Description'
+        attribute :remark, :aliases => 'Remark'
+        attribute :availability, :aliases => 'Availability'
+        attribute :icon, :aliases => 'Icon'
+
+
+        def delete
+          service.delete_note(identity)
+          true
+        end
+        alias_method :destroy, :delete
+
+        def save
+          requires :name, :content
+          if identity
+            Fog::Logger.warning("Update Note #{identity}")
+            data = service.modify_note(@attributes).body["Note"]
+          else
+            Fog::Logger.warning("Create New Note")
+            data = service.create_note(@attributes).body["Note"]
+          end
+          merge_attributes(data)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/models/script/notes.rb

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/sakuracloud/models/script/note'
+
+module Fog
+  module SakuraCloud
+    class Script
+      class Notes < Fog::Collection
+        model Fog::SakuraCloud::Script::Note
+
+        def all
+          load service.list_notes.body['Notes']
+        end
+
+        def get(id)
+          all.find { |f| f.id == id }
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def delete(id)
+          service.delete_note(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/models/volume/disk.rb

@@ -42,6 +42,14 @@ module Fog
           service.associate_ip_to_disk(@attributes[:id], subnet )
           true
         end
+
+        def register_script(notes)
+          note_ids = []
+          note_ids << notes
+          requires :id
+          service.register_note_to_disk(@attributes[:id], note_ids.flatten )
+          true
+        end
       end
     end
   end

data/lib/fog/sakuracloud/requests/script/create_note.rb

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+module Fog
+  module SakuraCloud
+    class Script
+      class Real
+        def create_note(options)
+          body = {
+            "Note" => {
+              "Name" => options[:name],
+              "Content" => options[:content]
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => 201,
+            :method => 'POST',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def create_note(options)
+          response = Excon::Response.new
+          response.status = 201
+          response.body = {
+            "Note"=>
+            {"ID"=>"112700759852",
+             "Name"=>"foobar",
+             "Class"=>"shell",
+             "Scope"=>"user",
+             "Content"=>"#!/bin/bash",
+             "Description"=>"",
+             "Remark"=>nil,
+             "Availability"=>"available",
+             "CreatedAt"=>"2015-09-05T20:32:12+09:00",
+             "ModifiedAt"=>"2015-09-05T20:32:12+09:00",
+             "Icon"=>nil,
+             "Tags"=>[]},
+            "Success"=>true,
+            "is_ok"=>true}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/script/delete_note.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+
+module Fog
+  module SakuraCloud
+    class Script
+      class Real
+        def delete_note( id )
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'DELETE',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note/#{id}"
+          )
+        end
+      end # Real
+
+      class Mock
+        def delete_note( id )
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "Note"=>
+            {"ID"=>"112700759822",
+             "Name"=>"hogehoge2",
+             "Class"=>"shell",
+             "Scope"=>"user",
+             "Content"=>"",
+             "Description"=>"",
+             "Remark"=>nil,
+             "Availability"=>"available",
+             "CreatedAt"=>"2015-09-05T20:04:24+09:00",
+             "ModifiedAt"=>"2015-09-05T20:04:24+09:00",
+             "Icon"=>nil,
+             "Tags"=>[]},
+            "Success"=>true,
+            "is_ok"=>true
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/script/list_notes.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+module Fog
+  module SakuraCloud
+    class Script
+      class Real
+        def list_notes(options = {})
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :method => 'GET',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note"
+          )
+        end
+      end
+
+      class Mock
+        def list_notes(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "Internet"=>[
+              {"Index"=>0,
+               "ID"=>"112600707538",
+               "Switch"=>{
+                 "ID"=>"112600707539",
+                 "Name"=>"router2"
+               }
+            }
+            ],
+            "is_ok"=>true
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/script/modify_note.rb

@@ -0,0 +1,53 @@
+# coding: utf-8
+
+module Fog
+  module SakuraCloud
+    class Script
+      class Real
+        def modify_note( options )
+          body = {
+            "Note" => {
+              "Name" => options[:name],
+              "Content" => options[:content]
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'PUT',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note/#{options[:id]}",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def modify_note( options )
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "Note"=>
+            {"ID"=>"112700759822",
+             "Name"=>"hogehoge2",
+             "Class"=>"shell",
+             "Scope"=>"user",
+             "Content"=>"",
+             "Description"=>"",
+             "Remark"=>nil,
+             "Availability"=>"available",
+             "CreatedAt"=>"2015-09-05T20:04:24+09:00",
+             "ModifiedAt"=>"2015-09-05T20:04:24+09:00",
+             "Icon"=>nil,
+             "Tags"=>[]},
+            "Success"=>true,
+            "is_ok"=>true
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/volume/configure_disk.rb

@@ -25,8 +25,7 @@ module Fog
         def configure_disk( disk_id, sshkey_id )
           response = Excon::Response.new
           response.status = 200
-          response.body = {
-          }
+          response.body = {"Success"=>true, "is_ok"=>true}
           response
         end
       end

data/lib/fog/sakuracloud/requests/volume/register_note_to_disk.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+
+module Fog
+  module Volume
+    class SakuraCloud
+      class Real
+        def register_note_to_disk( disk_id, notes )
+          body = {
+            "Notes" => notes.map {|note| { "ID" => note }}
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'PUT',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{disk_id.to_s}/config",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def register_note_to_disk( disk_id, notes )
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/script.rb

@@ -0,0 +1,76 @@
+module Fog
+  module SakuraCloud
+    class Script < Fog::Service
+      requires     :sakuracloud_api_token
+      requires     :sakuracloud_api_token_secret
+
+      recognizes   :sakuracloud_api_url
+
+      model_path 'fog/sakuracloud/models/script'
+      model      :note
+      collection :notes
+
+      request_path 'fog/sakuracloud/requests/script'
+      request      :list_notes
+      request      :create_note
+      request      :modify_note
+      request      :delete_note
+
+      class Real
+        def initialize(options = {})
+          @auth_encord = Base64.strict_encode64([
+            options[:sakuracloud_api_token],
+            options[:sakuracloud_api_token_secret]
+          ].join(':'))
+          Fog.credentials[:sakuracloud_api_token]        = options[:sakuracloud_api_token]
+          Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
+
+          @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+
+          @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
+        end
+
+        def request(params)
+          response = parse @connection.request(params)
+          response
+        end
+
+        private
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+      end
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :notes => []
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @sakuracloud_api_token        = options[:sakuracloud_api_token]
+          @sakuracloud_api_token_secret = options[:sakuracloud_api_token_secret]
+        end
+
+        def data
+          self.class.data[@sakuracloud_api_token]
+          self.class.data[@sakuracloud_api_token_secret]
+        end
+
+        def reset_data
+          self.class.data.delete(@sakuracloud_api_token)
+          self.class.data.delete(@sakuracloud_api_token_secret)
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/fog/sakuracloud/volume.rb

@@ -20,6 +20,7 @@ module Fog
       request      :create_disk
       request      :configure_disk
       request      :associate_ip_to_disk
+      request      :register_note_to_disk
       request      :attach_disk
       request      :delete_disk
       request      :list_archives

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -225,6 +225,8 @@ files:
 - lib/fog/sakuracloud/models/network/routers.rb
 - lib/fog/sakuracloud/models/network/switch.rb
 - lib/fog/sakuracloud/models/network/switches.rb
+- lib/fog/sakuracloud/models/script/note.rb
+- lib/fog/sakuracloud/models/script/notes.rb
 - lib/fog/sakuracloud/models/volume/archive.rb
 - lib/fog/sakuracloud/models/volume/archives.rb
 - lib/fog/sakuracloud/models/volume/disk.rb
@@ -246,6 +248,10 @@ files:
 - lib/fog/sakuracloud/requests/network/delete_switch.rb
 - lib/fog/sakuracloud/requests/network/list_routers.rb
 - lib/fog/sakuracloud/requests/network/list_switches.rb
+- lib/fog/sakuracloud/requests/script/create_note.rb
+- lib/fog/sakuracloud/requests/script/delete_note.rb
+- lib/fog/sakuracloud/requests/script/list_notes.rb
+- lib/fog/sakuracloud/requests/script/modify_note.rb
 - lib/fog/sakuracloud/requests/volume/associate_ip_to_disk.rb
 - lib/fog/sakuracloud/requests/volume/attach_disk.rb
 - lib/fog/sakuracloud/requests/volume/configure_disk.rb
@@ -254,6 +260,8 @@ files:
 - lib/fog/sakuracloud/requests/volume/list_archives.rb
 - lib/fog/sakuracloud/requests/volume/list_disks.rb
 - lib/fog/sakuracloud/requests/volume/list_plans.rb
+- lib/fog/sakuracloud/requests/volume/register_note_to_disk.rb
+- lib/fog/sakuracloud/script.rb
 - lib/fog/sakuracloud/version.rb
 - lib/fog/sakuracloud/volume.rb
 - tests/helper.rb
@@ -286,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Sakura no Cloud