milc 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f8e0a16eb96c30657eb8c71bf4add5bf8f88920
-  data.tar.gz: be37765d13f6380b3ade730f2469b8ed55480c88
+  metadata.gz: 134ae9236cb673f0c1182329f7da5b50f513dc85
+  data.tar.gz: 83b991325dfc2683fe41d392b36e151f3f458c8e
 SHA512:
-  metadata.gz: a89feb84b3d46a7e789f86dae61c6dc071297179939db727c42232d48b4ca3797d6d062f4a10719b06ebd230c5cdae2a37e0c1b09aa31675ed480fff26184e62
-  data.tar.gz: 87a828e7b0068904507c491d2e09b2debc25a9e4ee0156eff9aa9d6f5d8309b055a36e0e633b69acfb1397064b87ec046f06eba1ca8b0e11735f0c5277e61807
+  metadata.gz: f3eed2dd80e4f4d4e26b1dba89c133ef207ac05330949480374463364b3fca1031e6d764d4e15684cc63fdb1a9e4951b537bf8f90aa7856754ea9ceef47367f8
+  data.tar.gz: 17e6a97c1d1ec6b6a1702edb4912ff7cc3167ea202f9388651b6c2de7d6159f50d4413a1cfc1087f9cac620ecb1b3f6d0d365a4b303280800c4481e18661eee5

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.2.0
+before_install: gem install bundler --version '>= 1.8.0'

data/README.md

@@ -1,5 +1,8 @@
 # Milc
 
+[![Gem Version](https://badge.fury.io/rb/milc.png)](https://rubygems.org/gems/milc)
+[![Build Status](https://travis-ci.org/groovenauts/milc.svg?branch=master)](https://travis-ci.org/groovenauts/milc)
+
 Milc means "Magellan Infrastructure Library and Command".
 
 This gem supports portability from command to ruby library in order to realize automated orchestration.

data/lib/milc/base.rb

@@ -28,8 +28,9 @@ module Milc
       Milc.logger
     end
 
-    def execute(cmd)
-      res = LoggerPipe.run(logger, cmd, dry_run: Milc.dry_run)
+    def execute(cmd, options = {})
+      options[:dry_run] = Milc.dry_run
+      res = LoggerPipe.run(logger, cmd, options)
       block_given? ? yield(res) : res
     end
 

data/lib/milc/dsl/ansible.rb

@@ -7,7 +7,8 @@ module Milc::Dsl
       # https://github.com/mitchellh/vagrant/blob/0098b7604d071948fd37b16dd10b87b6df49b624/plugins/provisioners/ansible/provisioner.rb#L58
       command = "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook #{cmd}"
       command << " -vvvv" if Milc.verbose
-      execute(command, &block)
+      execute(command, returns: :none, logging: :both, &block)
+      nil
     end
 
   end

data/lib/milc/dsl/gcloud.rb

@@ -4,15 +4,20 @@ module Milc::Dsl
   module Gcloud
 
     def gcloud(cmd, &block)
-      cmd << " --project #{project}" unless cmd =~ /\s\-\-project[\s\=]/
-      execute("gcloud #{cmd}", &block)
+      execute(build_gcloud_command(cmd), returns: :none, logging: :both, &block)
     end
 
     def json_gcloud(cmd)
-      r = gcloud(cmd + " --format json")
+      r = execute(build_gcloud_command(cmd + " --format json"), returns: :stdout, logging: :stderr)
       res = r.nil? ? nil : JSON.parse(r)
       block_given? ? yield(res) : res
     end
 
+    def build_gcloud_command(cmd)
+      r = "gcloud #{cmd}"
+      r << " --project #{project}" unless cmd =~ /\s\-\-project[\s\=]/
+      r
+    end
+
   end
 end

data/lib/milc/gcloud/backend/gcloud_command.rb

@@ -9,8 +9,9 @@ module Milc
     module Backend
       class GcloudCommand
 
-        def execute(cmd)
-          res = LoggerPipe.run(Milc.logger, cmd, dry_run: Milc.dry_run)
+        def execute(cmd, options = {})
+          options[:dry_run] = Milc.dry_run
+          res = LoggerPipe.run(Milc.logger, cmd, options)
           block_given? ? yield(res) : res
         end
 

data/lib/milc/gcloud/resource.rb

@@ -48,10 +48,10 @@ module Milc
         @commands = commands || []
       end
 
-      def __gcloud(cmd, &block)
+      def __gcloud(cmd, options = {}, &block)
         c = "gcloud #{cmd} --format json"
         c << " --project #{project}" unless c =~ /\s\-\-project[\s\=]/
-        res = Gcloud.backend.execute(c, &block)
+        res = Gcloud.backend.execute(c, options, &block)
         res ? JSON.parse(res) : nil
       end
 
@@ -69,7 +69,11 @@ module Milc
 
       def call_action(action, cmd_args, attrs = nil, &block)
         attr_args = attrs.nil? ? '' : build_attr_args(attrs)
-        __gcloud("#{service} #{resource} #{action} #{cmd_args} #{attr_args}", &block)
+        options =
+          action =~ /\Alist|\Adescribe|\Aget/ ?
+            {returns: :stdout, logging: :stderr} :
+            {returns: :none  , logging: :both}
+        __gcloud("#{service} #{resource} #{action} #{cmd_args} #{attr_args}", options, &block)
       end
 
       def call_update(cmd_args, attrs, &block)

data/lib/milc/version.rb

@@ -1,3 +1,3 @@
 module Milc
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/milc.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
     # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
   end
 
-  spec.add_runtime_dependency "logger_pipe", "~> 0.3.0"
+  spec.add_runtime_dependency "logger_pipe", "~> 0.3.1"
   spec.add_runtime_dependency "activesupport", "~> 4.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement