pec 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d29ffb28f864e94df722cb8da0c152b670446b07
-  data.tar.gz: 6fbfda8c8af3a68833f7b30bd34a5a92dfa48cb5
+  metadata.gz: 12573783d7f7d2956311eac8ddafc10dd576ef54
+  data.tar.gz: c995f4586be47905890d741abe3c419733deff28
 SHA512:
-  metadata.gz: 7079d41c4aac4497a19a4c4e6df31080b57a6e0d98e729c883f95b188ad79b318ff31f4e1304a1f4dfae6164f920c913b3a53495696a3337a675d65f859eb56f
-  data.tar.gz: 7afb5135a78958e7b513dbc485fa2d6da50abcb885bd7a25951cabc897d50c9f18e73eba5f30af7ea3fa702e3b44df3f83d845ec44538fe1b88464d589903eb6
+  metadata.gz: 532ce626a2742c53c8cd53869141b66b7cb455112a2a74a4e8b1208dac528512727aacbd696dede2975d7e0cf590b104a330824c2541b62853dceafc6a6465db
+  data.tar.gz: 912b3adf04d3d12b5d36cc5a0f4a410827bdbfb33a414f4f554287807b4ba0d68462847e0f591be05d8ab048c932f8b4ec47a8fa89a57e1ee1bfb474d8e18e9a

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
 - 2.0.0
 - 2.1.6
 - 2.2.2
+addons:
+  code_climate:
+    repo_token: c969d1896316cbd26ab70d3b7fef4f4e168df83b849fa7f16a1885569c86f29c

data/Gemfile

@@ -12,6 +12,4 @@ group :development, :test do
   gem "rspec"
   gem "rake"
 end
-group :test do
-  gem 'coveralls', :require => false
-end
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -1,8 +1,10 @@
 # Pec
 [![Build Status](https://travis-ci.org/pyama86/pec.svg?branch=master)](https://travis-ci.org/pyama86/pec)
+[![Code Climate](https://codeclimate.com/github/pyama86/pec/badges/gpa.svg)](https://codeclimate.com/github/pyama86/pec)
+[![Test Coverage](https://codeclimate.com/github/pyama86/pec/badges/coverage.svg)](https://codeclimate.com/github/pyama86/pec/coverage)
 
-OpenStackにおいて複数サーバの起動や、
-DHCPサーバがない状況でのIP自動採番を実現します。
+OpenStackにおいて複数サーバの起動一括起動停止や、 DHCPサーバがない状況でのIP自動採番を実現します。
+作って壊してが驚くほどかんたんに。
 
 ## Install
 

data/lib/pec/cli.rb

@@ -24,45 +24,65 @@ module Pec
 
     desc 'up', 'create vm by Pec.yaml'
     def up(host_name = nil)
-      config = Pec::Configure.new
-      config.load("Pec.yaml")
-
+      config = Pec::Configure.new("Pec.yaml")
       director = Pec::VmDirector.new
 
-      config.each do |host|
-        next if !host_name.nil? && host.name != host_name
-
+      config.filter_by_host(host_name).each do |host|
         begin
           director.make(host)
         rescue Pec::Errors::Error => e
-          puts e
-          puts "can't create server:#{host.name}"
+          pec_create_err_message(e, host)
         rescue Excon::Errors::Error => e
-          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
+          excon_err_message(e)
         end
       end if config
       rescue Errno::ENOENT => e
         puts e
       rescue Pec::Errors::Configure => e
-        puts "configure can't load"
+        pec_config_err_message
     end
 
     option :force , type: :boolean, aliases: "-f"
     desc "destroy", "delete vm"
-    def destroy(name = nil)
-      config = Pec::Configure.new
-      config.load("Pec.yaml")
-      config.each do |host|
-        next if !name.nil? && host.name != name
+    def destroy(host_name = nil)
+      config = Pec::Configure.new("Pec.yaml")
+      director = Pec::VmDirector.new
+
+      config.filter_by_host(host_name).each do |host|
         begin
-          Pec::Compute::Server.new.destroy!(host.name) if options[:force] || yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
+          if options[:force] || yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
+            director.destroy!(host.name)
+          end
         rescue Pec::Errors::Error => e
-          puts e
-          puts "can't create server:#{host.name}"
+          pec_delete_err_message(e, host)
+        rescue Excon::Errors::Error => e
+          excon_err_message(e)
         end
       end if config
       rescue Errno::ENOENT => e
         puts e
+      rescue Pec::Errors::Configure => e
+        pec_config_err_message
+    end
+
+    no_tasks do
+      def pec_create_err_message(e, host)
+          puts e
+          puts "can't create server:#{host.name}"
+      end
+
+      def pec_delete_err_message(e, host)
+          puts e
+          puts "can't create server:#{host.name}"
+      end
+
+      def pec_config_err_message
+        puts "configure can't load"
+      end
+
+      def excon_err_message(e)
+          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
+      end
     end
   end
 end

data/lib/pec/configure.rb

@@ -3,7 +3,7 @@ module Pec
   class Configure
     include Enumerable
 
-    def load(file_name)
+    def initialize(file_name)
       YAML.load_file(file_name).to_hash.each do |config|
         host = Pec::Configure::Host.load(config)
         @configure ||= []
@@ -13,6 +13,10 @@ module Pec
         raise(Pec::Errors::Configure, e)
     end
 
+    def filter_by_host(host_name)
+      @configure.select {|h| host_name.nil? || host_name == h.name}
+    end
+
     def each
       @configure.each do |config|
         yield config

data/lib/pec/configure/ethernet.rb

@@ -11,14 +11,17 @@ module Pec
         end
       end
 
+      def find_port(ports)
+        ports.find { |p| p.name == @name }
+      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)
-          err = %w(bootproto).find {|k| !config[1].key?(k)}
-          raise(Pec::Errors::Ethernet, "skip! #{name}: #{err} is required!") unless err.nil?
+          raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto is required!") if config[1]["bootproto"].nil?
           true
         end
 

data/lib/pec/configure/user_data.rb

@@ -20,26 +20,24 @@ module Pec
 
         def make_port_content(config, ports)
           config.networks.map do |ether|
-            port_content = {}
-            %w(name device).each do |k|
-              port_content[k] = ether.name unless ether.options.key?(k)
-            end
+            ifcfg_content = {}
 
-            port_content["bootproto"] = ether.bootproto
-            port_content["type"] = ether.options['type'] ||'Ethernet'
-            port_content["onboot"] = ether.options['onboot'] || 'yes'
+            ifcfg_content["bootproto"] = ether.bootproto
+            ifcfg_content["name"]      = ether.options["name"]   || ether.name
+            ifcfg_content["device"]    = ether.options["device"] || ether.name
+            ifcfg_content["type"]      = ether.options['type']   ||'Ethernet'
+            ifcfg_content["onboot"]    = ether.options['onboot'] || 'yes'
+            ifcfg_content["hwaddr"]    = ether.find_port(ports).mac_address
             path = ether.options['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{ether.name}"
 
-            port = ports.find {|p| p.name == ether.name}
-            port_content["hwaddr"] = port.mac_address
-
             if ether.bootproto == "static"
-              port_content["netmask"] = port.netmask
-              port_content["ipaddr"] = port.ip_address
+              ifcfg_content["netmask"] = ether.find_port(ports).netmask
+              ifcfg_content["ipaddr"]  = ether.find_port(ports).ip_address
             end
-            port_content.merge!(ether.options)
+            ifcfg_content.merge!(ether.options)
+
             {
-              'content' => port_content.map {|k,v| "#{k.upcase}=#{v}"}.join("\n"),
+              'content' => ifcfg_content.map {|k,v| "#{k.upcase}=#{v}"}.join("\n"),
               'owner' => "root:root",
               'path' => path,
               'permissions' => "0644"

data/lib/pec/errors.rb

@@ -8,5 +8,6 @@ module Pec
     class Query < Error; end
     class UserData < Error; end
     class Configure < Error; end
+    class SecurityGroup < Error; end
   end
 end

data/lib/pec/network/port.rb

@@ -15,11 +15,8 @@ module Pec
       def assign!(ip)
         # dhcp ip recycle
         if request_any_address?(ip)
-          free = fetch_free_port
-          if free
-            ip = IP.new("#{free["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}")
-            @config = free
-          end
+          @config = fetch_free_port
+          ip = IP.new("#{@config["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") unless @config.nil?
         end
 
         case
@@ -79,9 +76,7 @@ module Pec
 
       def create(ip)
         options = { security_groups: @security_groups }
-        if ip.to_s != subnet["cidr"]
-          options.merge!({ fixed_ips: [{ subnet_id: @subnet["id"], ip_address: ip.to_addr}]})
-        end
+        options.merge!({ fixed_ips: [{ subnet_id: @subnet["id"], ip_address: ip.to_addr}]}) if ip.to_s != subnet["cidr"]
         response = Fog::Network[:openstack].create_port(@subnet["network_id"], options)
 
         if response

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/pec/vm_director.rb

@@ -22,6 +22,10 @@ module Pec
       @compute.create(config.name, image_ref, flavor_ref, ports, options)
     end
 
+    def destroy!(server_name)
+      @compute.destroy!(host.name)
+    end
+
     def get_ports(config)
       config.networks.map do |ether|
         begin
@@ -42,7 +46,8 @@ module Pec
     def get_security_group_id(security_groups)
       security_groups.map do |name|
         sg = @security_group.fetch(name)
-        sg["id"] if sg
+        raise(Pec::Errors::SecurityGroup, "security_group:#{name} is not found!") unless sg
+        sg["id"]
       end if security_groups
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - kazuhiko yamashita