brocket 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c63386ef0806f1a1e9ac34e9692c8529ad2cc0
-  data.tar.gz: 5965c22451aec6eb6e003df5bbba94219383d1b8
+  metadata.gz: 2cf15efdda61d666c2aa047bdda6db4024ac212e
+  data.tar.gz: e90df6e84b87669fe3d7640098028f4a051671c6
 SHA512:
-  metadata.gz: 2e80157b476a1ff419dcf54501b44dbaabb419ea62ed3d7e4c842fba6f1a2b46f7d0f1d21072097f2e4597b2642b6e809b212d8334a4ab1bdacbf285adb2bd07
-  data.tar.gz: 1cfadc60e0bf8e3b6cd42536d31311e394663b619dd6f80b5afcd21481764c709c295aa01a54ab755bc895ddefbb60efeb9635f536168a183c10279878fc3bdb
+  metadata.gz: 268c7b07e00950c094bf5e10763e9bb4bb1c3a59fc1f956fe9a94bec10c0d77ce2e4fb42a9c575e8a31f9f826353dfdbf0fa547d7e848626874767a0d37a95c0
+  data.tar.gz: b1e6605471f85a84ad8d44f6ca3bf0bb1367f542f658e61791045c79cbdbc4ec6087d280a872fbc2e63585bfa4bf05a9fa819ee0a6e682428f00ca42dda308a8

data/README.md

@@ -7,10 +7,10 @@ config IMAGE_NAME and hooks like BEFORE_BUILD and AFTER_BUILD.
 ## Behavior
 
 - `brocket release`
-    1. check the local repository si clean and commited
+    1. check the local repository is clean and commited
     2. same as `brocket docker build`
-    3. push by git
-    4. push by docker
+    3. same as `brocket git push`
+    4. docker push
 - `brocket docker build`
     1. cd WORKING_DIR
     2. call BEFORE_BUILD
@@ -18,6 +18,10 @@ config IMAGE_NAME and hooks like BEFORE_BUILD and AFTER_BUILD.
         - call ON_BUILD_COMPLETE on success
         - call ON_BUILD_ERROR on failure
     4. call AFTER_BUILD
+- `brocket git push`
+    1. git tag
+    2. git push
+        - git tag -d if error
 
 ## Installation
 
@@ -122,6 +126,10 @@ Set the registry host name to push not to hub.docker.com .
 
 Set the user name on the registry host to push.
 
+#### DOCKER_PUSH_EXTRA_TAG
+
+Set the another tag to push. e.g. "latest"
+
 
 ### For more information
 

data/lib/brocket/base.rb

@@ -44,7 +44,11 @@ module BRocket
       end
 
       def sh(cmd)
-        LoggerPipe.run(logger, cmd, dry_run: dryrun?)
+        LoggerPipe.run(logger, cmd, dry_run: dryrun?, returns: :none, logging: :both)
+      end
+
+      def sh_stdout(cmd)
+        LoggerPipe.run(logger, cmd, returns: :stdout, logging: :stderr) # ignore dryrun?
       end
 
     end

data/lib/brocket/docker.rb

@@ -71,14 +71,18 @@ module BRocket
       def build_push_command
         registry = config_hash['DOCKER_PUSH_REGISTRY']
         username = config_hash['DOCKER_PUSH_USERNAME']
+        extra_tag = config_hash['DOCKER_PUSH_EXTRA_TAG']
         img_name = [registry, username, config_image_name].compact.join('/')
         version = sub(VersionFile).current
         build_cmd = config_hash['DOCKER_PUSH_COMMAND'] || 'docker push'
         cmd = [
           (registry || username) ?
-            "docker tag -f #{config_image_name}:#{version} #{img_name}:#{version}" :
-            nil,
+            "docker tag -f #{config_image_name}:#{version} #{img_name}:#{version}" : nil,
+          (registry || username) && extra_tag ?
+            "docker tag -f #{config_image_name}:#{version} #{img_name}:#{extra_tag}" : nil,
           "#{build_cmd} #{img_name}:#{version}",
+          extra_tag ?
+            "#{build_cmd} #{img_name}:#{extra_tag}" : nil,
         ].compact.join(' && ')
         return cmd
       end

data/lib/brocket/git.rb

@@ -61,7 +61,7 @@ module BRocket
       end
 
       def already_tagged?
-        if sh('git tag').split(/\n/).include?(version_tag)
+        if sh_stdout('git tag').split(/\n/).include?(version_tag)
           $stderr.puts "Tag #{version_tag} has already been created."
           true
         end

data/lib/brocket/version.rb

@@ -1,3 +1,3 @@
 module BRocket
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/brocket/Dockerfiles/Dockerfile-push-extra-tag

@@ -0,0 +1,24 @@
+#
+# [config] IMAGE_NAME: "rails-example"
+# [config]
+# [config] DOCKER_PUSH_COMMAND: "gcloud docker push"
+# [config] DOCKER_PUSH_REGISTRY: "asia.gcr.io"
+# [config] DOCKER_PUSH_USERNAME: "groovenauts"
+# [config] DOCKER_PUSH_EXTRA_TAG: "latest"
+#
+
+FROM groovenauts/ruby:2.1.2
+MAINTAINER tech@groovenauts.jp
+
+ENV RAILS_ENV production
+
+# for debug via HTTP dicrectly
+EXPOSE 3000
+
+ADD . /usr/src/app
+WORKDIR /usr/src/app
+VOLUME /usr/src/app/log
+
+RUN bundle install --system
+
+CMD ["bundle", "exec", "rails", "s", "-e", "production"]

data/spec/brocket/base_spec.rb

@@ -7,11 +7,11 @@ describe BRocket::Base do
   describe :sh do
     let(:cmd){ 'echo "FOO"' }
     it "without dryrun" do
-      expect(LoggerPipe).to receive(:run).with(BRocket.logger, cmd, dry_run: nil)
+      expect(LoggerPipe).to receive(:run).with(BRocket.logger, cmd, dry_run: nil, returns: :none, logging: :both)
     end
     it "with dryrun" do
       subject.options = {dryrun: true}
-      expect(LoggerPipe).to receive(:run).with(BRocket.logger, cmd, dry_run: true)
+      expect(LoggerPipe).to receive(:run).with(BRocket.logger, cmd, dry_run: true, returns: :none, logging: :both)
     end
 
     after do

data/spec/brocket/docker_spec.rb

@@ -67,6 +67,28 @@ describe BRocket::Docker do
     end
   end
 
+  describe "Dockerfile-push-extra-tag" do
+    let(:original_image_name){ "rails-example" }
+    let(:gcr_image_name){ "asia.gcr.io/groovenauts/rails-example" }
+    let(:filepath){ File.expand_path("../Dockerfiles/Dockerfile-push-extra-tag", __FILE__) }
+    before{ allow(BRocket).to receive(:user_pwd).and_return(File.dirname(filepath)) }
+    before{ subject.options = {dockerfile: filepath} }
+    let(:expected_options){ {dockerfile: filepath} }
+
+    describe :push do
+      it do
+        expected_cmd = [
+          "docker tag -f #{original_image_name}:#{version} #{gcr_image_name}:#{version}",
+          "docker tag -f #{original_image_name}:#{version} #{gcr_image_name}:latest",
+          "gcloud docker push #{gcr_image_name}:#{version}",
+          "gcloud docker push #{gcr_image_name}:latest",
+        ].join(' && ')
+        expect(subject).to receive(:sh).with(expected_cmd)
+        subject.push
+      end
+    end
+  end
+
   describe "Dockerfile-working_dir" do
     let(:filepath){ File.expand_path("../Dockerfiles/Dockerfile-working_dir", __FILE__) }
     let(:expected_options){ {dockerfile: filepath} }

data/spec/brocket/git_spec.rb

@@ -31,7 +31,7 @@ describe BRocket::Git do
     end
   end
 
-  describe "Dockerfile-basic" do
+  describe "Dockerfile-git-tag" do
     let(:filepath){ File.expand_path("../Dockerfiles/Dockerfile-git-tag", __FILE__) }
     let(:version_path){ File.expand_path("../Dockerfiles/VERSION", __FILE__) }
     before do
@@ -73,7 +73,7 @@ describe BRocket::Git do
 
     describe :push do
       it :valid do
-        expect(subject).to receive(:sh).with("git tag").and_return(%w[0.9.1 0.9.2].join("\n"))
+        expect(subject).to receive(:sh_stdout).with("git tag").and_return(%w[0.9.1 0.9.2].join("\n"))
         expect(subject).to receive(:sh).with("git tag -a -m \"Version containers/rails_example/1.0.0\" containers/rails_example/1.0.0")
         expect($stdout).to receive(:puts).with(/tagged containers\/rails_example\/1\.0\.0/i)
         expect(subject).to receive(:sh).with("git push")
@@ -82,14 +82,14 @@ describe BRocket::Git do
         subject.push
       end
       it :already_tagged do
-        expect(subject).to receive(:sh).with("git tag").and_return(%w[0.9.1 0.9.2 1.0.0 1.0.1].map{|v| "containers/rails_example/#{v}"}.join("\n"))
+        expect(subject).to receive(:sh_stdout).with("git tag").and_return(%w[0.9.1 0.9.2 1.0.0 1.0.1].map{|v| "containers/rails_example/#{v}"}.join("\n"))
         expect($stderr).to receive(:puts).with(/tag .+ already .+ created/i)
         subject.push
       end
 
       context :error do
         before do
-          expect(subject).to receive(:sh).with("git tag").and_return(%w[0.9.1 0.9.2].join("\n"))
+          expect(subject).to receive(:sh_stdout).with("git tag").and_return(%w[0.9.1 0.9.2].join("\n"))
         end
 
         it "do untagging on error at git tag" do
@@ -112,6 +112,23 @@ describe BRocket::Git do
         end
       end
 
+      context "with dryrun" do
+        it do
+          subject.options = {dryrun: true}.update(subject.options)
+          # Call `git tag` even if --dryrun is given
+          expect(LoggerPipe).to receive(:run).
+                                 with(BRocket.logger, "git tag", returns: :stdout, logging: :stderr).
+                                 and_return(%w[0.9.1 0.9.2].join("\n"))
+          opts = {dry_run: true, returns: :none, logging: :both}
+          expect(LoggerPipe).to receive(:run).with(BRocket.logger, "git tag -a -m \"Version containers/rails_example/1.0.0\" containers/rails_example/1.0.0", opts)
+          expect($stdout).to receive(:puts).with(/tagged containers\/rails_example\/1\.0\.0/i)
+          expect(LoggerPipe).to receive(:run).with(BRocket.logger, "git push", opts)
+          expect(LoggerPipe).to receive(:run).with(BRocket.logger, "git push --tags", opts)
+          expect($stdout).to receive(:puts).with(/pushed/i)
+          subject.push
+        end
+      end
+
     end
   end
 

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: brocket
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - akima
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: thor
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logger_pipe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logger_pipe
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,6 +110,7 @@ files:
 - spec/brocket/Dockerfiles/Dockerfile-git-tag
 - spec/brocket/Dockerfiles/Dockerfile-hook
 - spec/brocket/Dockerfiles/Dockerfile-invalid-version
+- spec/brocket/Dockerfiles/Dockerfile-push-extra-tag
 - spec/brocket/Dockerfiles/Dockerfile-working_dir
 - spec/brocket/Dockerfiles/VERSION
 - spec/brocket/base_spec.rb
@@ -132,7 +133,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -147,9 +148,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: supports to build Docker Container with VERSION
 test_files:
@@ -158,6 +159,7 @@ test_files:
 - spec/brocket/Dockerfiles/Dockerfile-git-tag
 - spec/brocket/Dockerfiles/Dockerfile-hook
 - spec/brocket/Dockerfiles/Dockerfile-invalid-version
+- spec/brocket/Dockerfiles/Dockerfile-push-extra-tag
 - spec/brocket/Dockerfiles/Dockerfile-working_dir
 - spec/brocket/Dockerfiles/VERSION
 - spec/brocket/base_spec.rb
@@ -176,4 +178,4 @@ test_files:
 - spec/brocket/version_file_spec.rb
 - spec/brocket_spec.rb
 - spec/spec_helper.rb
-has_rdoc:
+has_rdoc: