pec 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae9991c84cf924eeded0c16490deff591c71818d
-  data.tar.gz: b98a208107bef4732f3e4d48c17655f7d06de6bc
+  metadata.gz: 51d1f4a559c7dc366bb4c442104d9760484bef59
+  data.tar.gz: 437e6972dc94cbe1ac4b972206973b08156a1919
 SHA512:
-  metadata.gz: 2f56a90b1cbfeeeff1654ff0cd6e7a6cd625976aa49cd438f848ba0f8998c47281eec54429f678bd07cf3459a49b188da59a59d23439a32223c480830936d8b4
-  data.tar.gz: 2059f9a12057dbb4c64bbb31bdd88298df94b4da33db613598a3710cfb6fb1de3fe2ae53b9e4512fcb4d1d66e4c1b462c47a9bb7ce64af29683b6d44fff82226
+  metadata.gz: dc363157a8f5b2c33e1fbf32460aae9d4abde925ca46f7dea1ca37585f10db1a176e0ca70b36d7a16b45b997d461019c8f13421d7e45951c1e01110386a2d5a1
+  data.tar.gz: 5cecc2df45db91965807350748c6a60d12c7891d0eac9c4c74a87140379391a42927ad3d4c4a8aaa6ac01c827ef683a9c4663fae1bd5a6993bafd2a398ea58a8

data/lib/pec/configure.rb

@@ -4,6 +4,8 @@ module Pec
     include Enumerable
 
     def initialize(file_name)
+      @configure = []
+
       if file_name.is_a?(Hash)
         hash = file_name
       else
@@ -11,8 +13,7 @@ module Pec
       end
 
       hash.each do |config|
-        host = Pec::Configure::Host.load(config)
-        @configure ||= []
+        host = Pec::Configure::Host.new(config)
         @configure << host if host
       end
       rescue Psych::SyntaxError,NoMethodError => e

data/lib/pec/configure/ethernet.rb

@@ -2,7 +2,10 @@ module Pec
   class Configure
     class Ethernet
       attr_reader :name, :bootproto, :ip_address, :options
-      def initialize(config)
+      def initialize(name, config)
+        check_require_key(name, config)
+        check_network_key(name, config)
+
         @name       = config[0];
         @bootproto  = config[1]["bootproto"];
         @ip_address = config[1]["ip_address"];
@@ -58,26 +61,20 @@ module Pec
         @bootproto == "static"
       end
 
-      class << self
-        def load(name, config)
-          self.new(config) if check_require_key(name, config) && check_network_key(name, config)
-        end
-
-        def check_require_key(name, config)
-          raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto is required!") if config[1]["bootproto"].nil?
-          true
-        end
+      def check_require_key(name, config)
+        raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto is required!") if config[1]["bootproto"].nil?
+        true
+      end
 
-        def check_network_key(name, config)
-          net = config[1]
-          case
-          when (net["bootproto"] == "static" && net["ip_address"].nil?)
-            raise(Pec::Errors::Ethernet, "skip! #{name}: ip_address is required by bootproto static")
-          when (net["bootproto"] != "static" && net["bootproto"] != "dhcp")
-            raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto set the value dhcp or static")
-          end
-          true
+      def check_network_key(name, config)
+        net = config[1]
+        case
+        when (net["bootproto"] == "static" && net["ip_address"].nil?)
+          raise(Pec::Errors::Ethernet, "skip! #{name}: ip_address is required by bootproto static")
+        when (net["bootproto"] != "static" && net["bootproto"] != "dhcp")
+          raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto set the value dhcp or static")
         end
+        true
       end
     end
   end

data/lib/pec/configure/host.rb

@@ -3,42 +3,36 @@ module Pec
     class Host
       attr_reader :name, :image, :flavor,:security_group, :user_data, :networks, :templates, :tenant
       def initialize(config)
-        @name = config[0];
-        @image = config[1]["image"];
-        @flavor = config[1]["flavor"];
+        check_format(config)
+        append_network(config[1])
+        @name           = config[0];
+        @image          = config[1]["image"];
+        @flavor         = config[1]["flavor"];
         @security_group = config[1]["security_group"];
-        @user_data = config[1]["user_data"];
-        @templates = config[1]["templates"]
-        @tenant = config[1]["tenant"]
+        @user_data      = config[1]["user_data"];
+        @templates      = config[1]["templates"]
+        @tenant         = config[1]["tenant"]
       end
 
-      def append_network(network)
+      def append_network(config)
         @networks ||= []
-        @networks << network
-      end
-
-      class << self
-        def load(config)
-          host = self.new(config) if check_format(config)
+        config["networks"].each do |net|
+          raise(Pec::Errors::Ethernet, "please! network interface format is Array") unless net.kind_of?(Array)
 
-          config[1]["networks"].each do |net|
-            raise(Pec::Errors::Ethernet, "please! network interface format is Array") unless net.kind_of?(Array)
+          if ethernet = Pec::Configure::Ethernet.new(config, net)
+            @networks << ethernet
+          end
 
-            net_config = Pec::Configure::Ethernet.load(config[0], net)
-            host.append_network(net_config) if net_config
-
-          end if host && config[1]["networks"]
-          host
-        end
+        end if config["networks"]
+      end
 
-        def check_format(config)
-          err = %w(image flavor tenant).find {|r| !config[1].key?(r) || config[1][r].nil? }
-          raise(Pec::Errors::Host,"skip! #{config[0]}: #{err} is required!") unless  err.nil?
+      def check_format(config)
+        err = %w(image flavor tenant).find {|r| !config[1].key?(r) || config[1][r].nil? }
+        raise(Pec::Errors::Host,"skip! #{config[0]}: #{err} is required!") unless  err.nil?
 
-          err = %w(security_group templates).find {|r| config[1].key?(r) && !config[1][r].kind_of?(Array) }
-          raise(Pec::Errors::Host,"#{config[0]}: please! #{err} format is Array!") unless err.nil?
-          true
-        end
+        err = %w(security_group templates).find {|r| config[1].key?(r) && !config[1][r].kind_of?(Array) }
+        raise(Pec::Errors::Host,"#{config[0]}: please! #{err} format is Array!") unless err.nil?
+        true
       end
     end
   end

data/lib/pec/director.rb

@@ -10,6 +10,8 @@ class Director
             director.execute!(host) if director.do_it?(host)
           rescue Pec::Errors::Error => e
             director.err_message(e, host)
+          rescue Excon::Errors::SocketError => e
+            err_message(e)
           rescue Excon::Errors::Error => e
             excon_err_message(e)
           end

data/lib/pec/director/helper.rb

@@ -7,11 +7,13 @@ module Pec
           host.networks.map do |ether|
             ip = IP.new(ether.ip_address)
 
-            port_subnet = Pec::Network::Subnet.fetch_by_cidr(ip.network.to_s)
-            raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!") unless port_subnet
+            unless port_subnet = Pec::Network::Subnet.fetch_by_cidr(ip.network.to_s)
+              raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!")
+            end
 
-            port = Pec::Network::Port.assign(ether.name, ip, port_subnet, get_security_group_id(host.security_group))
-            raise(Pec::Errors::Port, "ip addess:#{ip.to_addr} can't create port!") unless port
+            unless port = Pec::Network::Port.assign(ether.name, ip, port_subnet, get_security_group_id(host.security_group))
+              raise(Pec::Errors::Port, "ip addess:#{ip.to_addr} can't create port!")
+            end
 
             puts "#{host.name}: assingn ip #{port.ip_address}".green
             port

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/pec.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency 'thor', '~> 0.19.1'
-  spec.add_dependency 'fog', '~> 1.31.0'
+  spec.add_dependency 'fog', '~> 1.32.0'
   spec.add_dependency 'ruby-ip', '~> 0.9.3'
   spec.add_dependency 'activesupport', '~> 4.2.1'
   spec.add_dependency 'colorator', '~> 0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.32.0
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement