tengine_resource 0.5.13 → 0.5.14

data/Gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "tengine_support", "~> 0.3.24"
+gem "tengine_support", "~> 0.3.27"
 gem "tengine_core", "~> 0.5.23"
 
 gem "wakame-adapters-tengine", "~> 0.0.0"
@@ -22,7 +22,7 @@ group :development do
   gem "rspec", "~> 2.6.0"
   gem "factory_girl", "~> 2.1.2"
   gem "yard", "~> 0.7.2"
-  gem "bundler", "~> 1.0.18"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.6.4"
   # gem "rcov", ">= 0"
   gem "simplecov", "~> 0.5.3"

data/Gemfile.lock

@@ -2,11 +2,11 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.6.2)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activesupport (3.1.3)
+    activesupport (3.1.4)
       multi_json (~> 1.0)
     amq-client (0.8.7)
       amq-protocol (>= 0.8.4)
@@ -36,8 +36,8 @@ GEM
       systemu (>= 2.4.0)
     mongo (1.5.2)
       bson (= 1.5.2)
-    mongoid (2.3.4)
-      activemodel (~> 3.1)
+    mongoid (2.3.5)
+      activemodel (~> 3.1.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.4)
@@ -60,8 +60,8 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    systemu (2.4.2)
-    tengine_core (0.5.28)
+    systemu (2.5.0)
+    tengine_core (0.5.38)
       activemodel (~> 3.1.0)
       activesupport (~> 3.1.0)
       bson (~> 1.5.2)
@@ -72,19 +72,19 @@ GEM
       selectable_attr (~> 0.3.15)
       tengine_event (~> 0.4.0)
       tengine_support (~> 0.3.12)
-    tengine_event (0.4.6)
+    tengine_event (0.4.8)
       activesupport (>= 3.0.0)
       amqp (~> 0.8.0)
       tengine_support (>= 0.3.24)
       uuid (~> 2.3.4)
-    tengine_support (0.3.24)
+    tengine_support (0.3.27)
       activesupport (>= 3.0.0)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
     uuid (2.3.5)
       macaddr (~> 1.0)
-    wakame-adapters-tengine (0.0.6)
+    wakame-adapters-tengine (0.0.1)
       json
-      right_aws (~> 2.1.0)
+      right_aws (= 2.1.0)
       rspec
     yard (0.7.5)
 
@@ -93,7 +93,7 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest (~> 4.6.2)
-  bundler (~> 1.0.18)
+  bundler (~> 1.1.3)
   factory_girl (~> 2.1.2)
   jeweler (~> 1.6.4)
   net-ssh (~> 2.2.1)
@@ -101,6 +101,6 @@ DEPENDENCIES
   rspec (~> 2.6.0)
   simplecov (~> 0.5.3)
   tengine_core (~> 0.5.23)
-  tengine_support (~> 0.3.24)
+  tengine_support (~> 0.3.27)
   wakame-adapters-tengine (~> 0.0.0)
   yard (~> 0.7.2)

data/README.rdoc

@@ -17,4 +17,4 @@ tengine_event is distributed under the MPL2.0 or LGPLv3 or the dual license of M
 
 == Copyright
 
-Copyright (c) 2011 nautilus-technologies.com
+Copyright (c) 2012 Groovenauts, Inc.

data/Rakefile

@@ -19,7 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MPL2.0/LGPLv3"
   gem.summary = %Q{tengine_resource provides physical/virtual server management}
   gem.description = %Q{tengine_resource provides physical/virtual server management}
-  gem.email = "tengine@nautilus-technologies.com"
+  gem.email = "tengine-info@groovenauts.jp"
   gem.authors = %w[taigou totty g-morita shyouhei akm hiroshinakao]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.5.14

data/lib/tengine/resource/provider/wakame.rb

@@ -532,9 +532,32 @@ class Tengine::Resource::Provider::Wakame < Tengine::Resource::Provider::Ec2
     result = connect do |conn|
       conn.describe_instances(uuids)
     end
-    hash_key_convert(result, option[:convert])
+    result = hash_key_convert(result, option[:convert])
+    result.each do |r|
+      replace_value_of_hash(r, :private_ip_address) do |v|
+        v.first if v.is_a?(Array)
+      end
+      replace_value_of_hash(r, :ip_address) do |v|
+        "nw-data\=#{$1}" if (v =~ /^nw\-data\=\[\"(.+)\"\]$/)
+      end
+    end
+    result
+  end
+
+  private
+  def replace_value_of_hash(hash, key)
+    [key, key.to_s].each do |k|
+      if value = hash[k]
+        if result = yield(value)
+          hash[k] = result
+          return
+        end
+      end
+    end
   end
 
+  public
+
   def describe_images_for_api(uuids = [], option = {})
     result = connect do |conn|
       conn.describe_images(uuids)

data/spec/mongoid_en.yml

@@ -0,0 +1,48 @@
+en:
+  mongoid:
+    errors:
+      messages:
+        taken:
+          is already taken
+        document_not_found:
+          Document not found for class %{klass} with id(s) %{identifiers}.
+        invalid_database:
+          "Database should be a Mongo::DB, not %{name}."
+        invalid_options:
+          "Invalid option :%{invalid} provided to relation :%{name}. Valid options
+          are: %{valid}."
+        invalid_type:
+          Field was defined as a(n) %{klass}, but received a %{other} with
+          the value %{value}.
+        unsupported_version:
+          MongoDB %{version} not supported, please upgrade
+          to %{mongo_version}.
+        validations:
+          Validation failed - %{errors}.
+        invalid_collection:
+          Access to the collection for %{klass} is not allowed since it
+          is an embedded document, please access a collection from
+          the root document.
+        invalid_field:
+          Defining a field named %{name} is not allowed. Do not define
+          fields that conflict with Mongoid internal attributes or method
+          names. Use Mongoid.destructive_fields to see what names this includes.
+        too_many_nested_attribute_records:
+          Accepting nested attributes for %{association} is limited
+          to %{limit} records.
+        embedded_in_must_have_inverse_of:
+          Options for embedded_in association must include inverse_of.
+        dependent_only_references_one_or_many:
+          The dependent => destroy|delete option that was supplied
+          is only valid on references_one or references_many associations.
+        association_cant_have_inverse_of:
+          Defining an inverse_of on this association is not allowed. Only
+          use this option on embedded_in or references_many as array.
+        calling_document_find_with_nil_is_invalid:
+          Calling Document#find with nil is invalid
+        unsaved_document:
+          "You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved."
+        mixed_relations:
+          Referencing a(n) %{embedded} document from the %{root} document via a
+          relational association is not allowed since the %{embedded} is embedded.

data/spec/spec_helper.rb

@@ -14,6 +14,9 @@ require 'mongoid'
 Mongoid.load!(File.expand_path('mongoid.yml', File.dirname(__FILE__)))
 Mongoid.database.connection.drop_database(Mongoid.database.name)
 
+I18n.backend = I18n::Backend::Simple.new
+I18n.backend.load_translations(File.expand_path('mongoid_en.yml', File.dirname(__FILE__)))
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/tengine/resource/watcher_spec.rb

@@ -13,6 +13,7 @@ describe Tengine::Resource::Watcher do
       :connection => {
         :host => "localhost", :port => 5672, :vhost => "/",
         :user => "guest", :pass => "guest", :logging => false,
+        :heartbeat_interval => 0,
         :insist => false, :auto_reconnect_delay => 1
       },
       :exchange => {

data/tengine_resource.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_resource"
-  s.version = "0.5.13"
+  s.version = "0.5.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "hiroshinakao"]
-  s.date = "2012-02-09"
+  s.date = "2012-05-02"
   s.description = "tengine_resource provides physical/virtual server management"
-  s.email = "tengine@nautilus-technologies.com"
+  s.email = "tengine-info@groovenauts.jp"
   s.executables = ["tengine_resource_watchd"]
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/tengine_resource.rb",
     "spec/fixtures/goku_at_ec2_ap_northeast.rb",
     "spec/mongoid.yml",
+    "spec/mongoid_en.yml",
     "spec/spec_helper.rb",
     "spec/support/ec2.rb",
     "spec/support/mongo_index_key_log.rb",
@@ -127,7 +128,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tengine_support>, ["~> 0.3.24"])
+      s.add_runtime_dependency(%q<tengine_support>, ["~> 0.3.27"])
       s.add_runtime_dependency(%q<tengine_core>, ["~> 0.5.23"])
       s.add_runtime_dependency(%q<wakame-adapters-tengine>, ["~> 0.0.0"])
       s.add_runtime_dependency(%q<right_aws>, ["~> 2.1.0"])
@@ -135,12 +136,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<factory_girl>, ["~> 2.1.2"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.18"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.5.3"])
       s.add_development_dependency(%q<ZenTest>, ["~> 4.6.2"])
     else
-      s.add_dependency(%q<tengine_support>, ["~> 0.3.24"])
+      s.add_dependency(%q<tengine_support>, ["~> 0.3.27"])
       s.add_dependency(%q<tengine_core>, ["~> 0.5.23"])
       s.add_dependency(%q<wakame-adapters-tengine>, ["~> 0.0.0"])
       s.add_dependency(%q<right_aws>, ["~> 2.1.0"])
@@ -148,13 +149,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<factory_girl>, ["~> 2.1.2"])
       s.add_dependency(%q<yard>, ["~> 0.7.2"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.18"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<simplecov>, ["~> 0.5.3"])
       s.add_dependency(%q<ZenTest>, ["~> 4.6.2"])
     end
   else
-    s.add_dependency(%q<tengine_support>, ["~> 0.3.24"])
+    s.add_dependency(%q<tengine_support>, ["~> 0.3.27"])
     s.add_dependency(%q<tengine_core>, ["~> 0.5.23"])
     s.add_dependency(%q<wakame-adapters-tengine>, ["~> 0.0.0"])
     s.add_dependency(%q<right_aws>, ["~> 2.1.0"])
@@ -162,7 +163,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<factory_girl>, ["~> 2.1.2"])
     s.add_dependency(%q<yard>, ["~> 0.7.2"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.18"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<simplecov>, ["~> 0.5.3"])
     s.add_dependency(%q<ZenTest>, ["~> 4.6.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_resource
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
   prerelease: 
 platform: ruby
 authors:
@@ -14,22 +14,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &2166822140 !ruby/object:Gem::Requirement
+  requirement: &2154181620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.24
+        version: 0.3.27
   type: :runtime
   prerelease: false
-  version_requirements: *2166822140
+  version_requirements: *2154181620
 - !ruby/object:Gem::Dependency
   name: tengine_core
-  requirement: &2166821160 !ruby/object:Gem::Requirement
+  requirement: &2154180540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 0.5.23
   type: :runtime
   prerelease: false
-  version_requirements: *2166821160
+  version_requirements: *2154180540
 - !ruby/object:Gem::Dependency
   name: wakame-adapters-tengine
-  requirement: &2166819080 !ruby/object:Gem::Requirement
+  requirement: &2154179720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166819080
+  version_requirements: *2154179720
 - !ruby/object:Gem::Dependency
   name: right_aws
-  requirement: &2166818080 !ruby/object:Gem::Requirement
+  requirement: &2154178940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166818080
+  version_requirements: *2154178940
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2166816880 !ruby/object:Gem::Requirement
+  requirement: &2154178000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2166816880
+  version_requirements: *2154178000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166815800 !ruby/object:Gem::Requirement
+  requirement: &2154177380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2166815800
+  version_requirements: *2154177380
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2166815240 !ruby/object:Gem::Requirement
+  requirement: &2154176700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2166815240
+  version_requirements: *2154176700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2166814600 !ruby/object:Gem::Requirement
+  requirement: &2154174100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,21 +103,21 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2166814600
+  version_requirements: *2154174100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2166805000 !ruby/object:Gem::Requirement
+  requirement: &2154173140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.18
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *2166805000
+  version_requirements: *2154173140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2166802400 !ruby/object:Gem::Requirement
+  requirement: &2154172400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2166802400
+  version_requirements: *2154172400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2166801200 !ruby/object:Gem::Requirement
+  requirement: &2154170820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2166801200
+  version_requirements: *2154170820
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2166799720 !ruby/object:Gem::Requirement
+  requirement: &2154169680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,9 +147,9 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *2166799720
+  version_requirements: *2154169680
 description: tengine_resource provides physical/virtual server management
-email: tengine@nautilus-technologies.com
+email: tengine-info@groovenauts.jp
 executables:
 - tengine_resource_watchd
 extensions: []
@@ -188,6 +188,7 @@ files:
 - lib/tengine_resource.rb
 - spec/fixtures/goku_at_ec2_ap_northeast.rb
 - spec/mongoid.yml
+- spec/mongoid_en.yml
 - spec/spec_helper.rb
 - spec/support/ec2.rb
 - spec/support/mongo_index_key_log.rb
@@ -270,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1325199428952747449
+      hash: -1693079788214414263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: