mamiya 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa5600d98b716ed7b4a4bf9ba0a4c8e9b8e5d79c
-  data.tar.gz: 6af95ad395f75cdc35bb6b433fdc3f415409683c
+  metadata.gz: 900d91f672af5554eea950816c4e6dd8f24d93e3
+  data.tar.gz: 72a64125e25bbba31333248aa336ebe7996446cc
 SHA512:
-  metadata.gz: 3047ad5f502c4207c3b4b86cc2f95d88711ab188df5a1de042616157964a7a7d210e486261ed323b468fb1cc84dc321ff47284c227508551f3f95a7fb2888e4f
-  data.tar.gz: 5947558c626dadbe7396f5312907ee96b1823407d8ec7a458426f01d6826e113f5bb7c4cea6e08a033b67255c761e9e6edd5823eb79656da23d7f5d002be0011
+  metadata.gz: a0e992317d9e565cc8880e200554917a0561fae6b3e7a42e3c4a9991f4e7501dbc78a361207781add2bdf1232cef46b925df6d84910d91b4e10bf4d31afe8ed2
+  data.tar.gz: e0bc6292faa73ecb0c630da6fc7738457162d9a7d0b3d4870c8c616a9683879c91bf2a8e8a2078c326e4d36873053b1faf0b38770ff7fe2a67cfa074d5e958d7

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
+sudo: false
 cache: bundler
 rvm:
-  - "2.2"
-  - "2.1"
+  - "2.2.3"
+  - "2.1.7"
   - "2.0.0"
   - "ruby-head"
 

data/docs/faq.md

@@ -0,0 +1,5 @@
+# FAQs
+
+## What is good when using Mamiya instead of using Serf/Consul directly?
+
+Mamiya tracks all nodes status. -- e.g. you can know which node is having different version from others

data/docs/quick_start.md

@@ -57,7 +57,7 @@ set :web, {
 #### Run it
 
 ```
-mamiya master -c /etc/mamiya/config.rb
+mamiya master -C /etc/mamiya/config.rb
 ```
 
 ### Agent
@@ -112,7 +112,7 @@ end
 #### Run it
 
 ```
-mamiya master -c /etc/mamiya/config.rb
+mamiya agent -C /etc/mamiya/config.rb
 ```
 
 ### Confirm both working
@@ -163,7 +163,7 @@ end
 # Step `release` run when Release is required. Usually for restarting app process, etc.
 # Also these step declaration accepts labels for `only` and `except` key to limit agents to run on.
 # (Labels can be set by agent's configuration)
-release 'reload unicorn', only [:app] do
+release 'reload unicorn', only: [:app] do
   run 'pkill', '-HUP', '-f', 'unicorn'
 end
 ```
@@ -190,7 +190,7 @@ Great! You can unpack using `tar xf` to confirm what has packed, if you want.
 You have to push it onto storage to make available for agents.
 
 ```
-$ mamiya push -C ./config.rb
+$ mamiya push -C ./config.rb builds/20141118093701-myapp.tar.gz
 11/18 09:42:43   INFO  [Push] Pushing builds/20141118093701-myapp.tar.gz to storage(app=myapp)...
 11/18 09:42:43   INFO  [Push] DONE!
 ```

data/lib/mamiya/agent/tasks/switch.rb

@@ -125,7 +125,6 @@ module Mamiya
             target: release_path,
             config: config,
             logger: logger,
-            config: config,
             labels: agent.labels,
             no_release: !!task['no_release'],
             do_release: !!task['do_release'],

data/lib/mamiya/cli.rb

@@ -88,6 +88,7 @@ module Mamiya
     method_option :build_to, aliases: %w(--destination -t), type: :string
     method_option :skip_prepare_build, aliases: %w(--no-prepare-build -P), type: :boolean
     method_option :force_prepare_build, aliases: %w(--prepare-build -p), type: :boolean
+    method_option :push, aliases: %w(--push), type: :boolean
     def build
       # TODO: overriding name
       %i(build_from build_to).each { |k| script.set(k, File.expand_path(options[k])) if options[k] }
@@ -105,7 +106,13 @@ module Mamiya
         script.set :skip_prepare_build, true
       end
 
-      Mamiya::Steps::Build.new(script: script, logger: logger).run!
+      builder = Mamiya::Steps::Build.new(script: script, logger: logger)
+      builder.run!
+
+      if options[:push]
+        package = builder.package
+        push(package.name)
+      end
     end
 
     desc "push PACKAGE", "Upload built packages to storage."

data/lib/mamiya/script.rb

@@ -60,12 +60,15 @@ module Mamiya
         run_id = generate_run_id()
         logger = self.logger["run:#{run_id}"]
 
-        logger.info("$ #{args.shelljoin}")
+        env = args.last.is_a?(Hash) ? args.pop : {}
+        shellenv = env.empty? ? nil : "#{escape_env(env)} "
+
+        logger.info("$ #{shellenv}#{args.shelljoin}")
 
         err_r, err_w = IO.pipe
         out_r, out_w = IO.pipe
 
-        pid = spawn(*args, out: out_w, err: err_w)
+        pid = spawn(env, *args.map(&:to_s), out: out_w, err: err_w)
 
         [out_w, err_w].each(&:close)
 
@@ -76,7 +79,7 @@ module Mamiya
           Thread.new {
             until io.eof?
               str = io.gets
-              logger.__send__(severity, str.chomp)
+              logger.__send__(severity, "  #{str.chomp}")
               buf << str
               last_out = Time.now
             end
@@ -87,7 +90,7 @@ module Mamiya
           l = logger['timekeeper']
           loop do
             if 90 < (Time.now - last_out)
-              l.warn "pid #{pid} still running; since #{started_at}"
+              l.warn "pid #! {pid} still running; since #{started_at}"
             end
             sleep 60
           end
@@ -98,7 +101,7 @@ module Mamiya
         timekeeper_th.kill if timekeeper_th.alive?
 
         begin
-          timeout(3) { ths.each(&:join) }
+          Timeout.timeout(3) { ths.each(&:join) }
         rescue Timeout::Error
         end
         ths.each { |_| _.alive? && _.kill }
@@ -118,7 +121,7 @@ module Mamiya
 
         end
 
-        logger.info "pid #{pid} completed: #{args.inspect}"
+        logger.info "* pid #{pid} completed: #{args.inspect}"
 
         buf
       end
@@ -177,5 +180,11 @@ module Mamiya
         id
       end
     end
+
+    def escape_env(hash)
+      hash.map { |key, value|
+        [key.to_s.shellescape, value.to_s.shellescape].join("=")
+      }.join(" ")
+    end
   end
 end

data/lib/mamiya/steps/build.rb

@@ -51,6 +51,10 @@ module Mamiya
         end
       end
 
+      def package
+        @package ||= Mamiya::Package.new(package_path)
+      end
+
       private
 
       def run_before_build
@@ -140,10 +144,6 @@ module Mamiya
         @package_path ||= File.join(script.build_to, package_name)
       end
 
-      def package
-        @package ||= Mamiya::Package.new(package_path)
-      end
-
       def script_file
         @script_file ||= script.script_file || script._file
       end

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/script_spec.rb

@@ -37,6 +37,18 @@ describe Mamiya::Script do
         .from(false).to(true)
     end
 
+    context "when given environment variables" do
+      it "runs command with environment variables" do
+        output =  script.run("env", { "foo" => "bar" })
+        expect(output).to include("foo=bar")
+      end
+
+      it "logs environment variables with command" do
+        script.run("env", { "foo" => "bar" })
+        expect(log).to include([:info, "$ foo=bar env"])
+      end
+    end
+
     context "when the command failed" do
       it "logs error" do
         begin
@@ -68,12 +80,12 @@ describe Mamiya::Script do
 
     it "logs stdout as info" do
       script.run("echo", "foo")
-      expect(log).to include([:info, "foo"])
+      expect(log).to include([:info, "  foo"])
     end
 
     it "logs stderr as warn" do
       script.run("ruby", "-e", "warn 'bar'")
-      expect(log).to include([:warn, "bar"])
+      expect(log).to include([:warn, "  bar"])
     end
 
     it "returns captured output as String" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -180,6 +180,7 @@ files:
 - README.md
 - Rakefile
 - bin/mamiya
+- docs/faq.md
 - docs/internal/serf_events.md
 - docs/internal/serf_queries.md
 - docs/internal/tasks.md
@@ -299,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Fast deploy tool using tarballs and serf