milc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c239037f0df6a192cac2c900393eb454f12fc73
-  data.tar.gz: 82cb6fc05b307fcb1e84fc503262ffdae6762a01
+  metadata.gz: 5ff4faf628b2a56f8e278b8f7f2dcc266e2e08c1
+  data.tar.gz: 19d633cb4a2c227a13c2def2df6f28368be4de3f
 SHA512:
-  metadata.gz: 2fe22d49727f450be4370099bc0756627e931e6475862d88e2faa0d0c7c90bffe930966c23d3f7083ae104c34fd846ece2da91ebc81e7a787fef37fbe9ec7fe2
-  data.tar.gz: 10d7b3a2ba518e4dfd195de41101d546cd14988d4a06e273acf5b8036eee8bc30d7545571ea8fca10079f9f052148097eb8a285213804673b4d9b85ac474215b
+  metadata.gz: 3ab520669b91c498fd4ac6c24a0431bfa0a0e26f08708a4d774b33b525afadfc016f46adde48f46e358d6e4bf831778d8b52b0df7e713bd7cb82f4e066b53a54
+  data.tar.gz: 40296952ad7c1d003b3b1b3a01a1c63aae1d80c639d36ce717195be1c47c030cdcd62071db448f5a5f3012d8f2d7a98e041f8181960a2a09b248b2220a305676

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+--format Fuubar
 --color

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in milc.gemspec
 gemspec
+
+group :development do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
+  gem "simplecov"
+  gem "fuubar"
+end

data/lib/milc/base.rb

@@ -41,8 +41,7 @@ module Milc
     end
 
     attr_reader :config
-    attr_reader :project, :nebula
-    attr_reader :network_base, :region, :new_relic_license_key
+    attr_reader :project
 
     def dry_run
       Milc.dry_run
@@ -50,10 +49,6 @@ module Milc
 
     def load_config
       @project = config['PROJECT'] || ENV['PROJECT']
-      @nebula  = config['NEBULA'] || ENV['NEBULA']
-      @network_base =  config['NETWORK_BASE'] || ENV['NETWORK_BASE']
-      @region =config['REGION'] || ENV['REGION']
-      @new_relic_license_key = config['NEW_RELIC_LICENSE_KEY'] || ENV['NEW_RELIC_LICENSE_KEY']
     end
 
     def show_help_and_exit1
@@ -87,16 +82,18 @@ module Milc
       Milc.dry_run = !!options["n"]
       Milc.verbose = !!options["V"]
 
-      show_help_and_exit1 unless options["c"]
-
-      load_from_yaml(options["c"])
-      load_options(options)
+      if options["c"]
+        load_from_yaml(options["c"])
+        load_options(options)
+      else
+        show_help_and_exit1
+      end
     end
 
     def run(args)
       setup(args)
       process
-      exit 0
+      # exit 0
     end
 
   end

data/lib/milc/gcloud/compute/firewall_rules.rb

@@ -2,6 +2,8 @@
 
 require "milc/gcloud/compute"
 
+require 'active_support/core_ext/array/wrap'
+
 module Milc
   module Gcloud
     module Compute
@@ -25,7 +27,7 @@ module Milc
             :sourceRanges => :source_ranges,
             :targetTags   => :target_tags,
           }.each do |k1, k2|
-            res[k2] = res[k1] ? res[k1].sort : nil
+            res[k2] = res[k1] ? Array.wrap(res[k1]).sort : nil
           end
           super(attrs, res)
         end

data/lib/milc/gcloud/resource.rb

@@ -3,6 +3,7 @@
 require "milc/gcloud"
 
 require "yaml"
+require "json"
 
 require 'active_support/core_ext/string/inflections'
 
@@ -16,14 +17,15 @@ module Milc
 
         def command_def_for(service, resource)
           c = command_defs
-          s = c[service] or raise "service #{service.inspect} not found in #{commands.keys.join(', ')}"
-          s[resource] or raise "resource #{resource.inspect} not found in #{s.keys.join(' ')} of #{service.inspect}"
+          s = c[service.to_s] or raise "service #{service.inspect} not found in #{c.keys.join(', ')}"
+          s[resource.to_s] or raise "resource #{resource.inspect} not found in #{s.keys.join(' ')} of #{service.inspect}"
         end
 
         def lookup(project, service, resource)
           Milc.logger.debug("=" * 100)
           Milc.logger.debug("project: #{project}, service: #{service}, resource: #{resource}")
-
+          service = service.to_s
+          resource = resource.to_s
           command_def = command_def_for(service, resource)
           result = new(project, service, resource, command_def['commands'])
           service_module = Milc::Gcloud.const_get(service.classify)
@@ -132,7 +134,7 @@ module Milc
         call_update(cmd_args, attrs, &block)
       end
 
-      def delete(cmd_args, attrs, &block)
+      def delete(cmd_args, attrs = {}, &block)
         raise_if_invalid(:delete)
         name, args = *cmd_args.split(/\s+/, 2)
         r = find(name)

data/lib/milc/gcloud.rb

@@ -13,8 +13,6 @@ module Milc
     autoload :Sql     , 'milc/gcloud/sql'
     autoload :Dns     , 'milc/gcloud/dns'
 
-    autoload :UnsupportedCommandError, 'milc/gcloud/errors'
-
     class << self
       def backend
         @backend ||= Milc::Gcloud::Backend::GcloudCommand.new

data/lib/milc/version.rb

@@ -1,3 +1,3 @@
 module Milc
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/milc.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency "logger_pipe", "~> 0.2.0"
-  spec.add_runtime_dependency "activesupport", "~> 4.2.0"
+  spec.add_runtime_dependency "activesupport", "~> 4.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - akm
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,6 @@ files:
 - lib/milc/gcloud/compute/firewall_rules.rb
 - lib/milc/gcloud/compute/instances.rb
 - lib/milc/gcloud/compute/target_pools.rb
-- lib/milc/gcloud/errors.rb
 - lib/milc/gcloud/resource.rb
 - lib/milc/version.rb
 - milc.gemspec

data/lib/milc/gcloud/errors.rb

@@ -1,10 +0,0 @@
-require "milc"
-
-module Milc
-  module Gcloud
-
-    class UnsupportedCommandError < StandardError
-    end
-
-  end
-end