sakurraform 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88126f4ae6bc4935c5b39fecf16f266a36def3b4
-  data.tar.gz: 500102637b8e8c2ab46d66acc0572d35887741d2
+  metadata.gz: b5f5a476b605ae713423742cd27a16feff996a83
+  data.tar.gz: f72a7080d717c38cccda7ce83ad71e6b99d92a29
 SHA512:
-  metadata.gz: eddd0b20f908bd1ddabfc9d19dbde30258ce8df06ae12e54d99d0173c70d3806f3a1190713fe145c4e8cb3e0c6456bd0976bb958be4ab5a39796684c1cd7b0f2
-  data.tar.gz: af21a3f41402c7e5dc9deaabe9c527649965155c7187187e80897f7308d395bfebf8513625fbeb5bafb0271dc30fb0a1d31a32c82a8c5972adc6bd8f33943236
+  metadata.gz: 88a1afc61c100fc9334d4872381becb8e675749c233e3d0777ba7c60dc8c891f1e11cbcce49a6a374ff63493d0e2ec27e227a043a1af50a515fd16ab7e830286
+  data.tar.gz: af48f595e7aa87d27a25559bf4bca71d817687ba3bba173a9d1d86ba031de5be429cd52ba544c6c4673b251c69b7c835c03b23e53a47cd15de3b3ede95fbf202

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# CHANGELOG of sakurraform
+
+## v0.0.2
+
+- Fix: Change cli name to sakurraform
+- Change name from sakura_name to sakurraform_name of table.
+- Feature: sakurraform map
+- Feature: Base storage command
+    - Add aws-sdk to depends.
+
+## v0.0.1
+
+- Inital release.
+- create network and servers from yaml
+- show resources

data/README.md

@@ -1,8 +1,14 @@
 # Sakurraform
 
-[WIP]
+[![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.
+
+## TODO
+
+- delete resources.
+- update resources if detect diff.
 
-Manage Infrastructure from Code with Sakura no Cloud
 
 ## Installation
 
@@ -23,28 +29,121 @@ Or install it yourself as:
 ## Usage
 
 ```
-$ ./bin/sakkuraform 
+$ ./bin/sakurraform 
 Commands:
-  sakkuraform help [COMMAND]   # Describe available commands or one specific command
-  sakkuraform init             # initiaize .sakuracloud/credentials
-  sakkuraform plan SUBCOMMAND  # 
-  sakkuraform status           # show status
-  sakkuraform version          # show version
+  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 init
 
 Create credential file
 
-### sakkuraform plan SUBCOMMAND 
+### sakurraform plan SUBCOMMAND 
 
-#### sakkuraform plan generate
+#### sakurraform plan generate
 
 Create plan template.
 
-#### sakkuraform plan apply
+#### sakurraform plan apply
+
+Create resources from yaml and save state to file.
+
+```
+## Example 2 networks and 2 servers.
+
+$ ./bin/sakurraform plan apply
+Create new network defaultrouter
+[fog][WARNING] Create Router with public subnet
+[fog][WARNING] Waiting available new router...
+......      create  state/network/defaultrouter-dbfd50c0-2a2c-0132-62c2-38e8563c85ec.yml
+Create new network defaultrouter2
+[fog][WARNING] Create Router with public subnet
+[fog][WARNING] Waiting available new router...
+......      create  state/network/defaultrouter2-e5ea21c0-2a2c-0132-62c2-38e8563c85ec.yml
+Create new server server1
+[fog][WARNING] Create Server
+[fog][WARNING] Create Volume
+[fog][WARNING] Waiting disk until available
+.[fog][WARNING] Modifing disk
+Associate 133.242.242.242 to server1
+      create  state/server/server1-efc00f30-2a2c-0132-62c2-38e8563c85ec.yml
+Create new server server2
+[fog][WARNING] Create Server
+[fog][WARNING] Create Volume
+[fog][WARNING] Waiting disk until available
+.[fog][WARNING] Modifing disk
+Associate 133.242.242.243 to server2
+      create  state/server/server2-21a3a320-2a2d-0132-62c2-38e8563c85ec.yml
+```
+
+create once.
+
+```
+$ ./bin/sakurraform plan apply
+defaultrouter already available as defaultrouter-dbfd50c0-2a2c-0132-62c2-38e8563c85ec
+defaultrouter2 already available as defaultrouter2-e5ea21c0-2a2c-0132-62c2-38e8563c85ec
+server1 already available as server1-efc00f30-2a2c-0132-62c2-38e8563c85ec
+server2 already available as server2-21a3a320-2a2d-0132-62c2-38e8563c85ec
+```
+
+#### sakurraform status
+
+Show status of resources.
 
-Create resources from yaml.
+```
+$ ./bin/sakurraform status
+  Nework resources
+  +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
+  | name           | sakurraform_name                                    | sakura_id    | subnet             | gateway         |
+  +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
+  | defaultrouter  | defaultrouter-d9805cd0-295c-0132-62c1-38e8563c85ec  | 112600778154 | 133.242.242.192/28 | 133.242.242.193 |
+  +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
+  | defaultrouter2 | defaultrouter2-e2368190-295c-0132-62c1-38e8563c85ec | 112600778157 | 133.242.242.208/28 | 133.242.242.209 |
+  +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
+
+  Server resources
+  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
+  | name    | sakurraform_name                             | sakura_id    | ipaddress       | status | last_state_changed        |
+  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
+  | server1 | server1-ed6ea720-295c-0132-62c1-38e8563c85ec | 112600778159 | 133.242.242.194 | up     | 2014-09-29T01:47:57+09:00 |
+  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
+  | server2 | server2-1f9f9b40-295d-0132-62c1-38e8563c85ec | 112600778162 | 133.242.242.195 | up     | 2014-09-29T01:49:22+09:00 |
+  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
+
+```
+
+### sakurraform map
+
+open map page by bwowser...
+
+
+### sakurraform bs SUBCOMMAND 
+
+#### sakurraform bs create
+
+Create bucket(..just open browser)
+
+#### sakurraform bs ls
+
+list object entries.
+
+```
+$ ./bin/sakurraform bs ls
+  +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
+  | key      | content_length | content_type        | last_modified             | public_url                                            |
+  +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
+  | hogehoge | 0              | binary/octet-stream | 2014-09-30 02:14:27 +0900 | http://test-hogehgoe.b.storage.sakura.ad.jp/hogehoge |
+  +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
+  | mogemoge | 0              | binary/octet-stream | 2014-09-30 02:14:28 +0900 | http://test-hogehoge.b.storage.sakura.ad.jp/mogemoge |
+  +----------+----------------+---------------------+---------------------------+-------------------------------------------------------+
+```
 
 
 ## Contributing

data/lib/sakurraform/cli/bs.rb

@@ -0,0 +1,38 @@
+require 'aws-sdk'
+module SakurraForm
+  class Bs < Thor
+    include Thor::Actions
+    include SakurraForm::Helper
+
+    def self.source_root
+      File.expand_path("../../", __FILE__)
+    end
+
+    desc 'create', 'Create bucket(..just open browser)'
+    def create
+      system('open https://secure.sakura.ad.jp/storage/#!/namespace/manage/')
+    end
+
+    desc 'ls', 'list object entries'
+    def ls
+      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
+      )
+
+      bucket = s3.buckets[Fog.credentials[:sakura_base_storage_bucket]]
+      table = bucket.objects.entries.map do |ent|
+        {
+          :key => ent.key,
+          :content_type => ent.content_type,
+          :content_length => ent.content_length,
+          :last_modified => ent.last_modified,
+          :public_url => ent.public_url.to_s
+        }
+      end
+      Formatador.display_table(table, [:key, :content_length, :content_type, :last_modified, :public_url])
+    end
+  end
+end

data/lib/sakurraform/cli/init.rb

@@ -11,8 +11,10 @@ module SakurraForm
     desc 'init', 'initiaize .sakuracloud/credentials'
     def init
       empty_directory('.sakuracloud')
-      @sakuracloud_api_token = ask("Sakuracloud_api_token ? ")
-      @sakuracloud_api_token_secret = ask("Sakuracloud_api_token_secret ? ")
+      @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) ? ")
       template('templates/credentials.tt', ".sakuracloud/credentials")
     end
   end

data/lib/sakurraform/cli/map.rb

@@ -0,0 +1,14 @@
+module SakurraForm
+  class CLI  < Thor
+    include Thor::Actions
+
+    def self.source_root
+      File.expand_path("../../", __FILE__)
+    end
+
+    desc 'map', 'open sakura cloud map!'
+    def map
+      system('open https://secure.sakura.ad.jp/cloud/#!/map/map/')
+    end
+  end
+end

data/lib/sakurraform/cli/plan.rb

@@ -7,7 +7,7 @@ module SakurraForm
       File.expand_path("../../", __FILE__)
     end
 
-    desc 'generate', ''
+    desc 'generate', 'Generate template'
     def generate
       empty_directory('state')
       empty_directory('state/network')
@@ -16,7 +16,7 @@ module SakurraForm
       copy_file('templates/server.tt', "plan/server.yml")
     end
 
-    desc 'apply', ''
+    desc 'apply', 'Apply plan'
     def apply
       ## Prepare Network
       col_networks = SakurraForm::Collection.new('network')

data/lib/sakurraform/cli/status.rb

@@ -13,14 +13,14 @@ module SakurraForm
       col_network = SakurraForm::Collection.new('network')
       col_network.collection_resources(true)
       Formatador.display_line('[green]Nework resources[/]')
-      Formatador.display_table(build_state_network(col_network), [:name, :sakura_name, :sakura_id, :subnet, :gateway])
+      Formatador.display_table(build_state_network(col_network), [:name, :sakurraform_name, :sakura_id, :subnet, :gateway])
       say()
 
       ## Showdown Server
       col_server = SakurraForm::Collection.new('server')
       col_server.collection_resources(true)
       Formatador.display_line('[green]Server resources[/]')
-      Formatador.display_table(build_state_server(col_server), [:name, :sakura_name, :sakura_id, :ipaddress, :status, :last_state_changed])
+      Formatador.display_table(build_state_server(col_server), [:name, :sakurraform_name, :sakura_id, :ipaddress, :status, :last_state_changed])
     end
 
   end

data/lib/sakurraform/cli.rb

@@ -1,11 +1,20 @@
 require 'sakurraform/cli/version'
 require 'sakurraform/cli/init'
 require 'sakurraform/cli/plan'
+require 'sakurraform/cli/bs'
 require 'sakurraform/cli/status'
+require 'sakurraform/cli/map'
 
 module SakurraForm
   class CLI < Thor
-    desc "plan SUBCOMMAND", ''
+    desc "plan SUBCOMMAND", 'Manage plan'
     subcommand "plan", SakurraForm::Plan
   end
 end
+
+module SakurraForm
+  class CLI < Thor
+    desc "bs SUBCOMMAND", 'Manage Sakura no Base Storage'
+    subcommand "bs", SakurraForm::Bs
+  end
+end

data/lib/sakurraform/helper.rb

@@ -52,7 +52,7 @@ module SakurraForm
         table_datum = {}
 #        pp resource
         table_datum[:name] = resource.name
-        table_datum[:sakura_name] = resource.resource_id ? resource.resource_id : 'not created'
+        table_datum[:sakurraform_name] = resource.resource_id ? resource.resource_id : 'not created'
         table_datum[:sakura_id] = resource.remote_state ? resource.remote_state[:id] : 'not created'
         table_datum[:subnet] = resource.remote_state ? resource.remote_state[:subnets].first['NetworkAddress'] + '/' + resource.remote_state[:subnets].first['NetworkMaskLen'].to_s  : 'not created'
         table_datum[:gateway] = resource.remote_state ? resource.remote_state[:subnets].first['DefaultRoute'] : 'not created'
@@ -68,7 +68,7 @@ module SakurraForm
         table_datum = {}
 #        pp resource
         table_datum[:name] = resource.name
-        table_datum[:sakura_name] = resource.resource_id ? resource.resource_id : 'not created'
+        table_datum[:sakurraform_name] = resource.resource_id ? resource.resource_id : 'not created'
         table_datum[:sakura_id] = resource.remote_state ? resource.remote_state[:id] : 'not created'
         table_datum[:status] = resource.remote_state ? resource.remote_state[:instance]['Status'] : 'not created'
         table_datum[:last_state_changed] = resource.remote_state ? resource.remote_state[:instance]['StatusChangedAt'] : 'not created'

data/lib/sakurraform/templates/credentials.tt

@@ -1,3 +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" %>

data/lib/sakurraform/version.rb

@@ -1,3 +1,3 @@
 module SakurraForm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/sakurraform.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_dependency "uuid"
+  spec.add_dependency "aws-sdk"
   spec.add_dependency "chamber"
   spec.add_dependency "fog-sakuracloud", "~> 0.1.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakurraform
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sawanoboly
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  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: chamber
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +126,7 @@ description: Manage Infrastructure from Code with Sakura no Cloud
 email:
 - sawanoboriyu@higanworks.com
 executables:
-- sakkuraform
+- sakurraform
 extensions: []
 extra_rdoc_files: []
 files:
@@ -122,10 +136,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/sakkuraform
+- 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/version.rb