brocket 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf15efdda61d666c2aa047bdda6db4024ac212e
-  data.tar.gz: e90df6e84b87669fe3d7640098028f4a051671c6
+  metadata.gz: 11877a1035cefbf2e5fc03974785020abe76f506
+  data.tar.gz: 7aa8e5b2ea41dabf1340bb7aa3ec88dec609c703
 SHA512:
-  metadata.gz: 268c7b07e00950c094bf5e10763e9bb4bb1c3a59fc1f956fe9a94bec10c0d77ce2e4fb42a9c575e8a31f9f826353dfdbf0fa547d7e848626874767a0d37a95c0
-  data.tar.gz: b1e6605471f85a84ad8d44f6ca3bf0bb1367f542f658e61791045c79cbdbc4ec6087d280a872fbc2e63585bfa4bf05a9fa819ee0a6e682428f00ca42dda308a8
+  metadata.gz: 38588fe126cef222d6a46d947c16431707b8ffb49c7f10ba47c408a69e8c32c92e1849c4a5b7cebb080d036efdc20a66070a97e580622edea37ac8c28b517525
+  data.tar.gz: 26c84f52932368579a46644ca90e76a8a2ac81a2d72556cfa833dcf62e36a51d56fb3a3edea1c467f2060fa9e6512f610aa0afe61f9011905af7b71ce9e39994

data/lib/brocket/configurable.rb

@@ -10,6 +10,8 @@ module BRocket
     CONFIG_LINE_HEADER = /\A\#\s*#{Regexp.escape(CONFIG_LINE_SEP)}\s?/.freeze
 
     class_option :dockerfile, aliases: '-f', type: :string, default: "Dockerfile", desc: "Dockerfile to build"
+    # This option is used in Brocket::Docker, but it can set via BRocket::Cli
+    class_option :use_sudo_for_docker, aliases: '-S', type: :string, default: "auto", desc: "auto, true, false"
 
     no_commands do
       def config_image_name

data/lib/brocket/docker.rb

@@ -57,7 +57,7 @@ module BRocket
       def build_build_command
         img_name = config_image_name
         version = sub(VersionFile).current
-        cmd = "docker build -t #{img_name}:#{version}"
+        cmd = sudo("docker build -t #{img_name}:#{version}")
         if options[:dockerfile]
           fp = config_relpath
           unless fp == "Dockerfile"
@@ -77,12 +77,12 @@ module BRocket
         build_cmd = config_hash['DOCKER_PUSH_COMMAND'] || 'docker push'
         cmd = [
           (registry || username) ?
-            "docker tag -f #{config_image_name}:#{version} #{img_name}:#{version}" : nil,
+            sudo("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}",
+            sudo("docker tag -f #{config_image_name}:#{version} #{img_name}:#{extra_tag}") : nil,
+          sudo("#{build_cmd} #{img_name}:#{version}"),
           extra_tag ?
-            "#{build_cmd} #{img_name}:#{extra_tag}" : nil,
+            sudo("#{build_cmd} #{img_name}:#{extra_tag}") : nil,
         ].compact.join(' && ')
         return cmd
       end
@@ -93,6 +93,18 @@ module BRocket
         commands = commands.compact.map(&:strip).reject(&:empty?)
         commands.each{|cmd| sh(cmd) }
       end
+
+      def sudo(cmd)
+        if @sudo_required.nil?
+          @sudo_required =
+            case options[:use_sudo_for_docker]
+            when /auto/i then !system("docker ps >/dev/null 2>/dev/null")
+            when /true/i then true
+            else false
+            end
+        end
+        @sudo_required ? "sudo #{cmd}" : cmd
+      end
     end
 
   end

data/lib/brocket/git.rb

@@ -7,9 +7,15 @@ module BRocket
 
     desc "guard_clean", "Raise error if some difference exists."
     def guard_clean
-      (clean? && committed?) ?
-        success("[git guard_clean] OK") :
+      if (clean? && committed?)
+        if already_tagged? && !same_commit_as?(version_tag)
+          error("#{version_tag} is already tagged to another commit")
+        else
+          success("[git guard_clean] OK")
+        end
+      else
         error("There are files that need to be committed first. Run `git status`")
+      end
     end
 
     desc "push", "push commit and tag it"
@@ -73,6 +79,14 @@ module BRocket
         "%s%s" % [prefix, version]
       end
 
+      def same_commit_as?(tag)
+        get_sha(tag) == get_sha("HEAD")
+      end
+
+      def get_sha(obj)
+        sh_stdout("git show #{obj} --format=\"%H\" --quiet").strip
+      end
+
     end
 
   end

data/lib/brocket/version.rb

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

data/spec/brocket/docker_spec.rb

@@ -10,10 +10,12 @@ describe BRocket::Docker do
   let(:expected_options){ {"dockerfile"=>"Dockerfile"} }
   before do
     version_file = double(:version_file, current: version)
-    allow(version_file).to receive(:options=).with(expected_options)
+    allow(version_file).to receive(:options=).with(Hash)
     allow(BRocket::VersionFile).to receive(:new).and_return(version_file)
   end
 
+  before{ allow(subject).to receive(:system).with("docker ps >/dev/null 2>/dev/null").and_return(true) }
+
   describe "Dockerfile-basic" do
     let(:filepath){ File.expand_path("../Dockerfiles/Dockerfile-basic", __FILE__) }
     before{ allow(BRocket).to receive(:user_pwd).and_return(File.dirname(filepath)) }
@@ -190,4 +192,62 @@ describe BRocket::Docker do
     end
   end
 
+  describe "use_sudo_for_docker" do
+    let(:filepath){ File.expand_path("../Dockerfiles/Dockerfile-basic", __FILE__) }
+    before{ allow(BRocket).to receive(:user_pwd).and_return(File.dirname(filepath)) }
+    before{ subject.options = {dockerfile: filepath} }
+
+    context "auto and need sudo" do
+      before{ subject.options = {use_sudo_for_docker: "auto"}.update(subject.options) }
+      before{ allow(subject).to receive(:system).with("docker ps >/dev/null 2>/dev/null").and_return(false) }
+      it :build do
+        expect(subject).to receive(:sh).with("sudo docker build -t #{image_name}:#{version} -f Dockerfile-basic .")
+        subject.build
+      end
+      it :push do
+        expect(subject).to receive(:sh).with("sudo docker push #{image_name}:#{version}")
+        subject.push
+      end
+    end
+
+    context "auto and don't need sudo" do
+      before{ subject.options = {use_sudo_for_docker: "auto"}.update(subject.options) }
+      before{ allow(subject).to receive(:system).with("docker ps >/dev/null 2>/dev/null").and_return(true) }
+      it :build do
+        expect(subject).to receive(:sh).with("docker build -t #{image_name}:#{version} -f Dockerfile-basic .")
+        subject.build
+      end
+      it :push do
+        expect(subject).to receive(:sh).with("docker push #{image_name}:#{version}")
+        subject.push
+      end
+    end
+
+    context "true" do
+      before{ subject.options = {use_sudo_for_docker: "true"}.update(subject.options) }
+      before{ allow(subject).to receive(:system).with("docker ps >/dev/null 2>/dev/null").and_return(false) }
+      it :build do
+        expect(subject).to receive(:sh).with("sudo docker build -t #{image_name}:#{version} -f Dockerfile-basic .")
+        subject.build
+      end
+      it :push do
+        expect(subject).to receive(:sh).with("sudo docker push #{image_name}:#{version}")
+        subject.push
+      end
+    end
+
+    context "false" do
+      before{ subject.options = {use_sudo_for_docker: "false"}.update(subject.options) }
+      before{ allow(subject).to receive(:system).with("docker ps >/dev/null 2>/dev/null").and_return(true) }
+      it :build do
+        expect(subject).to receive(:sh).with("docker build -t #{image_name}:#{version} -f Dockerfile-basic .")
+        subject.build
+      end
+      it :push do
+        expect(subject).to receive(:sh).with("docker push #{image_name}:#{version}")
+        subject.push
+      end
+    end
+  end
+
 end

data/spec/brocket/git_spec.rb

@@ -40,6 +40,11 @@ describe BRocket::Git do
     end
 
     describe :guard_clean do
+      before do
+        allow(subject).to receive(:sh_stdout).with("git tag").and_return(%w[0.9.1 0.9.2].map{|v| "containers/rails_example/#{v}"}.join("\n"))
+        allow($stderr).to receive(:puts).with(/tag .+ already .+ created/i)
+      end
+
       it :clean_and_commited do
         expect(subject).to receive(:sh).with("git diff --exit-code")
         expect(subject).to receive(:sh).with("git diff-index --quiet --cached HEAD")
@@ -69,6 +74,33 @@ describe BRocket::Git do
           subject.guard_clean
         end
       end
+
+      context :already_tagged do
+        let(:sha01){ "7693b087d10319df5eaa78f016fd705a53f1d448" }
+        let(:sha02){ "a8dd73a3d43dd19077e333b71db8f2d86140df9e" }
+
+        before do
+          expect(subject).to receive(:sh).with("git diff --exit-code")
+          expect(subject).to receive(:sh).with("git diff-index --quiet --cached HEAD")
+          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"))
+        end
+
+        it "The SHAs are the same" do
+          expect(subject).to receive(:sh_stdout).with('git show containers/rails_example/1.0.0 --format="%H" --quiet').and_return(sha01)
+          expect(subject).to receive(:sh_stdout).with('git show HEAD --format="%H" --quiet').and_return(sha01)
+          expect(subject).to receive(:success).with(an_instance_of(String))
+          expect(subject).not_to receive(:error).with(an_instance_of(String))
+          subject.guard_clean
+        end
+
+        it "The HEAD SHA is different from the tag SHA" do
+          expect(subject).to receive(:sh_stdout).with('git show containers/rails_example/1.0.0 --format="%H" --quiet').and_return(sha01)
+          expect(subject).to receive(:sh_stdout).with('git show HEAD --format="%H" --quiet').and_return(sha02)
+          expect(subject).not_to receive(:success).with(an_instance_of(String))
+          expect(subject).to receive(:error).with(/already tagged/)
+          subject.guard_clean
+        end
+      end
     end
 
     describe :push do

data/spec/brocket/multi_app_proj_spec.rb

@@ -136,6 +136,7 @@ describe :multi_app_proj do
         # obj.options = {dockerfile: docker_relpath}
         obj
       end
+      before{ allow(docker_obj).to receive(:system).with("docker ps >/dev/null 2>/dev/null").and_return(true) }
       it{ expect(docker_obj.working_dir).to eq File.expand_path("..", base_dir) }
       it{ expect(docker_obj.config_filepath).to eq File.expand_path("Dockerfile", base_dir) }
       it{ expect(docker_obj.config_relpath ).to eq "app2/Dockerfile" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brocket
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor