sakurraform 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa3f19dc189852047b022f6d404c3a61b69c916
-  data.tar.gz: 33ead74fc49c69e686b001ecfaa7ff142c32ef11
+  metadata.gz: ed44b5ae49e93dd9302608bf2e5a03548e48edee
+  data.tar.gz: 9671d1bcc4b38ca2d916a454407c835d4feee828
 SHA512:
-  metadata.gz: f3a3f306726533f0fad6316de9fcc360237953b5bb5edfdc75e681808eff9d1020dea9749b25b9574496ef692aad6ac59351f0860183abfb19edd447b230ff7a
-  data.tar.gz: 16c96465fabc4067ffd9706bff46947f19d5a21fcd2f213f0342ca3ae5a76529dd3d00808bf0f84b714a117fa858afe29dab92d7859e4680bf07cd951fb40aaa
+  metadata.gz: b31c9e260249834073869a09691157c19bd70668b7d139cc95aa5de094d747b61af9df65add730177784209ed211299e722fe63714a57a25db9ab9895c2670f1
+  data.tar.gz: e88d4041efe29bf4e6df5eef78c6a55445b8115b319f444512739c3dc1f8dc58d052da1fd7b6664ee46609a1c2e8b11e8a3d28cbe1685e59c4d94c442a495363

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG of sakurraform
 
+## v0.2.0
+
+- Rename Base Storage to Object Storage
+- Pin AWS-SDK < 2
+
 ## v0.1.1
 
 - update sourcearchive id. HT: @moongift

data/README.md

@@ -3,7 +3,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/sakurraform.svg)](http://badge.fury.io/rb/sakurraform)
 
-Manage Infrastructure from Code with Sakura no Cloud and Base Storage.
+Manage Infrastructure from Code with Sakura no Cloud and Object Storage.
 
 ## TODO
 
@@ -29,13 +29,13 @@ And then execute:
 ```
 $ ./bin/sakurraform 
 Commands:
-  sakurraform bs SUBCOMMAND    # Manage Sakura no Base Storage
-  sakurraform help [COMMAND]   # Describe available commands or one specific command
-  sakurraform init             # initiaize .sakuracloud/credentials
-  sakurraform map              # open sakura cloud map!
-  sakurraform plan SUBCOMMAND  # Manage plan
-  sakurraform status           # show status
-  sakurraform version          # show version
+  sakurraform storage SUBCOMMAND  # Manage Sakura no Object Storage
+  sakurraform help [COMMAND]      # Describe available commands or one specific command
+  sakurraform init                # initiaize .sakuracloud/credentials
+  sakurraform map                 # open sakura cloud map!
+  sakurraform plan SUBCOMMAND     # Manage plan
+  sakurraform status              # show status
+  sakurraform version             # show version
 
 ```
 
@@ -137,32 +137,34 @@ $ ./bin/sakurraform status
 
 ### sakurraform map
 
-open map page by bwowser...
+open map page by browser...
 
 
-### sakurraform bs SUBCOMMAND 
+### sakurraform storage SUBCOMMAND 
 
+Note: Renamed from bs subcommand since v0.2.0.
 
 ```
-$ ./bin/sakurraform bs
+$ ./bin/sakurraform storage
 Commands:
-  sakurraform bs cat PATH        # cat object entry
-  sakurraform bs create          # Create bucket(..just open browser)
-  sakurraform bs delete PATH     # delete object entry
-  sakurraform bs help [COMMAND]  # Describe subcommands or one specific subcommand
-  sakurraform bs ls              # list object entries
+  sakurraform storage cat PATH        # cat object entry
+  sakurraform storage create          # Create bucket(..just open browser)
+  sakurraform storage delete PATH     # delete object entry
+  sakurraform storage help [COMMAND]  # Describe subcommands or one specific subcommand
+  sakurraform storage ls              # list object entries
+  sakurraform storage put FILE [KEY]  # put file to key. use filename to key by default.
 ```
 
-#### sakurraform bs create
+#### sakurraform storage create
 
 Create bucket(..just open browser)
 
-#### sakurraform bs ls
+#### sakurraform storage ls
 
 list object entries.
 
 ```
-$ ./bin/sakurraform bs ls
+$ ./bin/sakurraform storage ls
   +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
   | key      | content_length | content_type        | last_modified             | public_url                                            |
   +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
@@ -172,17 +174,28 @@ $ ./bin/sakurraform bs ls
   +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
 ```
 
-#### sakurraform bs cat
+#### sakurraform storage put
 
 ```
-$ ./bin/sakurraform bs cat 20140930_debug.out_0
+$ ./bin/sakurraform storage put install.sh
+File install.sh was put to install.sh.
+
+
+$ ./bin/sakurraform storage put install.sh myobj-key
+File install.sh was put to myobj-key.
+```
+
+#### sakurraform storage cat
+
+```
+$ ./bin/sakurraform storage cat 20140930_debug.out_0
 {"hoge":"mogemoge","piyo":"piyo"}
 ```
 
-#### sakurraform bs delete
+#### sakurraform storage delete
 
 ```
-$ ./bin/sakurraform bs delete 20140930_debug.out_0
+$ ./bin/sakurraform storage delete 20140930_debug.out_0
 deleting 20140930_debug.out_0
 ```
 

data/lib/sakurraform/cli.rb

@@ -1,7 +1,7 @@
 require 'sakurraform/cli/version'
 require 'sakurraform/cli/init'
 require 'sakurraform/cli/plan'
-require 'sakurraform/cli/bs'
+require 'sakurraform/cli/storage'
 require 'sakurraform/cli/status'
 require 'sakurraform/cli/map'
 
@@ -14,7 +14,7 @@ end
 
 module SakurraForm
   class CLI < Thor
-    desc "bs SUBCOMMAND", 'Manage Sakura no Base Storage'
-    subcommand "bs", SakurraForm::Bs
+    desc "storage SUBCOMMAND", 'Manage Sakura no Object Storage (replaced from bs command)'
+    subcommand "storage", SakurraForm::Storage
   end
 end

data/lib/sakurraform/cli/init.rb

@@ -13,8 +13,8 @@ module SakurraForm
       empty_directory('.sakuracloud')
       @sakuracloud_api_token = ask("Sakuracloud_api_token(required) ? ")
       @sakuracloud_api_token_secret = ask("Sakuracloud_api_token_secret(required) ? ")
-      @sakura_base_storage_bucket = ask("Sakura Base Storage buket name(optional) ? ")
-      @sakura_base_storage_token = ask("Sakura Base Storage token(optional) ? ")
+      @sakura_object_storage_bucket = ask("Sakura Object Storage buket name(optional) ? ")
+      @sakura_object_storage_token = ask("Sakura Object Storage token(optional) ? ")
       template('templates/credentials.tt', ".sakuracloud/credentials")
     end
   end

data/lib/sakurraform/cli/{bs.rb → storage.rb}

@@ -1,6 +1,6 @@
 require 'aws-sdk'
 module SakurraForm
-  class Bs < Thor
+  class Storage < Thor
     include Thor::Actions
     include SakurraForm::Helper
 
@@ -17,7 +17,7 @@ module SakurraForm
     def ls
       s3 = init_s3
 
-      bucket = s3.buckets[Fog.credentials[:sakura_base_storage_bucket]]
+      bucket = s3.buckets[Fog.credentials[:sakura_object_storage_bucket]]
       table = bucket.objects.entries.map do |ent|
         {
           :key => ent.key,
@@ -34,16 +34,26 @@ module SakurraForm
     def cat(path)
       s3 = init_s3
 
-      bucket = s3.buckets[Fog.credentials[:sakura_base_storage_bucket]]
+      bucket = s3.buckets[Fog.credentials[:sakura_object_storage_bucket]]
       obj = bucket.objects.find {|a| a.key == path }
       say(obj.read) if obj
     end
 
+    desc 'put FILE [KEY]', 'put file to key. use filename to key by default.'
+    def put(file, key = file)
+      s3 = init_s3
+
+      bucket = s3.buckets[Fog.credentials[:sakura_object_storage_bucket]]
+      obj = bucket.objects[key]
+      obj.write(Pathname.new(file))
+      say("File #{file} was put to #{key}.")
+    end
+
     desc 'delete PATH', 'delete object entry'
     def delete(path)
       s3 = init_s3
 
-      bucket = s3.buckets[Fog.credentials[:sakura_base_storage_bucket]]
+      bucket = s3.buckets[Fog.credentials[:sakura_object_storage_bucket]]
       obj = bucket.objects.find {|a| a.key == path }
       if obj
         say("deleting #{obj.key}")

data/lib/sakurraform/helper.rb

@@ -81,10 +81,10 @@ module SakurraForm
 
     def init_s3
       AWS::S3.new(
-        :access_key_id => Fog.credentials[:sakura_base_storage_bucket],
-        :secret_access_key => Fog.credentials[:sakura_base_storage_token] ,
-        :s3_endpoint => 'b.storage.sakura.ad.jp',
-        :use_ssl => false
+        :access_key_id => Fog.credentials[:sakura_object_storage_bucket],
+        :secret_access_key => Fog.credentials[:sakura_object_storage_token] ,
+        :s3_endpoint => 'b.sakurastorage.jp',
+        :use_ssl => true
       )
     end
 

data/lib/sakurraform/templates/credentials.tt

@@ -1,5 +1,5 @@
 default:
   sakuracloud_api_token: <%= @sakuracloud_api_token %>
   sakuracloud_api_token_secret: <%= @sakuracloud_api_token_secret %>
-  sakura_base_storage_bucket: <%= @sakura_base_storage_bucket ? @sakura_base_storage_bucket : "null" %>
-  sakura_base_storage_token: <%= @sakura_base_storage_token ? @sakura_base_storage_token : "null" %>
+  sakura_object_storage_bucket: <%= @sakura_object_storage_bucket ? @sakura_object_storage_bucket : "null" %>
+  sakura_object_storage_token: <%= @sakura_object_storage_token ? @sakura_object_storage_token : "null" %>

data/lib/sakurraform/version.rb

@@ -1,3 +1,3 @@
 module SakurraForm
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/sakurraform.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_dependency "uuid"
-  spec.add_dependency "aws-sdk"
+  spec.add_dependency "aws-sdk", "< 2.0"
   spec.add_dependency "chamber"
   spec.add_dependency "ipaddress"
-  spec.add_dependency "fog-sakuracloud", "~> 1.0.0"
+  spec.add_dependency "fog-sakuracloud"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sakurraform
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,16 +42,16 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: chamber
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,30 @@ dependencies:
   name: fog-sakuracloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -153,11 +153,11 @@ files:
 - bin/sakurraform
 - lib/sakurraform.rb
 - lib/sakurraform/cli.rb
-- lib/sakurraform/cli/bs.rb
 - lib/sakurraform/cli/init.rb
 - lib/sakurraform/cli/map.rb
 - lib/sakurraform/cli/plan.rb
 - lib/sakurraform/cli/status.rb
+- lib/sakurraform/cli/storage.rb
 - lib/sakurraform/cli/version.rb
 - lib/sakurraform/collections.rb
 - lib/sakurraform/helper.rb
@@ -192,7 +192,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: Manage Infrastructure from Code with Sakura no Cloud