brocket 0.1.0 → 0.2.0

data/spec/brocket/multi_app_proj/app2/VERSION

@@ -0,0 +1 @@
+0.1.0

data/spec/brocket/multi_app_proj_spec.rb

@@ -0,0 +1,148 @@
+require 'spec_helper'
+
+describe :multi_app_proj do
+  context "app1 with absolute path" do
+    let(:dockerfile){ File.expand_path("../multi_app_proj/app1/docker/Dockerfile", __FILE__) }
+
+    describe BRocket::VersionFile do
+      let(:version_obj) do
+        obj = BRocket::VersionFile.new
+        obj.options = {dockerfile: dockerfile}
+        obj
+      end
+      it{ expect(version_obj.current).to eq "1.2.1" }
+    end
+
+    describe BRocket::Git do
+      let(:git_obj) do
+        obj = BRocket::Git.new
+        obj.options = {dockerfile: dockerfile}
+        obj
+      end
+      it{ expect(git_obj.version_tag).to eq "1.2.1" }
+    end
+  end
+
+  context "app2 with absolute path" do
+    let(:dockerfile){ File.expand_path("../multi_app_proj/app2/Dockerfile", __FILE__) }
+
+    describe BRocket::VersionFile do
+      let(:version_obj) do
+        obj = BRocket::VersionFile.new
+        obj.options = {dockerfile: dockerfile}
+        obj
+      end
+      it{ expect(version_obj.current).to eq "0.1.0" }
+    end
+
+    describe BRocket::Git do
+      let(:git_obj) do
+        obj = BRocket::Git.new
+        obj.options = {dockerfile: dockerfile}
+        obj
+      end
+      it{ expect(git_obj.version_tag).to eq "app2/0.1.0" }
+    end
+  end
+
+  context "app1 with relative path" do
+    let(:base_dir){ File.expand_path("../multi_app_proj/app1", __FILE__) }
+    let(:docker_relpath){ "docker/Dockerfile" }
+
+    around do |example|
+      Dir.chdir(base_dir) do
+        example.run
+      end
+    end
+    before{ allow(BRocket).to receive(:user_pwd).and_return(base_dir) }
+
+    describe BRocket::VersionFile do
+      let(:version_obj) do
+        obj = BRocket::VersionFile.new
+        obj.options = {dockerfile: docker_relpath}
+        obj
+      end
+      it{ expect(version_obj.current).to eq "1.2.1" }
+    end
+
+    describe BRocket::Git do
+      let(:git_obj) do
+        obj = BRocket::Git.new
+        obj.options = {dockerfile: docker_relpath}
+        obj
+      end
+      it{ expect(git_obj.version_tag).to eq "1.2.1" }
+    end
+
+    describe BRocket::Docker do
+      let(:docker_obj) do
+        obj = BRocket::Docker.new
+        obj.options = {dockerfile: docker_relpath}
+        obj
+      end
+      it{ expect(docker_obj.working_dir).to eq base_dir }
+      it{ expect(docker_obj.config_filepath).to eq File.expand_path(docker_relpath, base_dir) }
+      it{ expect(docker_obj.config_relpath ).to eq docker_relpath }
+      it do
+        expect(docker_obj).to receive(:sh).with("docker build -t old_app1:1.2.1 -f docker/Dockerfile .")
+        docker_obj.build
+      end
+    end
+  end
+
+  context "app2 with relative path" do
+    let(:base_dir){ File.expand_path("../multi_app_proj/app2", __FILE__) }
+    # let(:docker_relpath){ "Dockerfile" }
+
+    around do |example|
+      Dir.chdir(base_dir) do
+        example.run
+      end
+    end
+
+    before{ allow(BRocket).to receive(:user_pwd).and_return(base_dir) }
+
+    describe BRocket::VersionFile do
+      let(:version_obj) do
+        obj = BRocket::VersionFile.new
+        # obj.options = {dockerfile: docker_relpath}
+        obj
+      end
+      it{ expect(version_obj.current).to eq "0.1.0" }
+      it do
+        Dir.chdir(version_obj.working_dir) do
+          expect(version_obj.current).to eq "0.1.0"
+        end
+      end
+    end
+
+    describe BRocket::Git do
+      let(:git_obj) do
+        obj = BRocket::Git.new
+        # obj.options = {dockerfile: docker_relpath}
+        obj
+      end
+      it{ expect(git_obj.version_tag).to eq "app2/0.1.0" }
+      it do
+        Dir.chdir(git_obj.working_dir) do
+          expect(git_obj.version_tag).to eq "app2/0.1.0"
+        end
+      end
+    end
+
+    describe BRocket::Docker do
+      let(:docker_obj) do
+        obj = BRocket::Docker.new
+        # obj.options = {dockerfile: docker_relpath}
+        obj
+      end
+      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" }
+      it do
+        expect(docker_obj).to receive(:sh).with("docker build -t new_app2:0.1.0 -f app2/Dockerfile .")
+        docker_obj.build
+      end
+    end
+  end
+end

data/spec/brocket/test_gem/Dockerfile

@@ -0,0 +1,18 @@
+#
+# [config] IMAGE_NAME: "test_gem"
+# [config]
+# [config] VERSION_SCRIPT: "ruby -r ./lib/test_gem/version.rb -e 'puts TestGem::VERSION'"
+# [config] GIT_TAG_PREFIX: "test_gem/"
+#
+
+FROM ruby:2.3.0
+MAINTAINER tech@groovenauts.jp
+
+COPY ./test_gem $TEST_GEM_HOME
+
+WORKDIR $TEST_GEM_HOME
+
+RUN bundle install --without test development \
+  && echo "export PATH=\$TEST_GEM_HOME/docker:\$PATH" >> $HOME/.bashrc
+
+CMD [ "/bin/bash" ]

data/spec/brocket/test_gem/README.md

@@ -0,0 +1,7 @@
+
+## Directories
+
+- Dockerfile
+- lib/
+    - test_gem/
+        - version.rb

data/spec/brocket/test_gem/lib/test_gem/version.rb

@@ -0,0 +1,3 @@
+module TestGem
+  VERSION = '0.2.1'
+end

data/spec/brocket/test_gem_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe :test_gem do
+  let(:dockerfile){ File.expand_path("../test_gem/Dockerfile", __FILE__) }
+
+  describe BRocket::VersionFile do
+    let(:version_obj) do
+      obj = BRocket::VersionFile.new
+      obj.options = {dockerfile: dockerfile}
+      obj
+    end
+    it{ expect(version_obj.current).to eq "0.2.1" }
+  end
+
+  describe BRocket::Git do
+    let(:git_obj) do
+      obj = BRocket::Git.new
+      obj.options = {dockerfile: dockerfile}
+      obj
+    end
+    it{ expect(git_obj.version_tag).to eq "test_gem/0.2.1" }
+  end
+end

data/spec/brocket/version_file_spec.rb

@@ -1,8 +1,12 @@
+# coding: utf-8
 require 'spec_helper'
 
 describe BRocket::VersionFile do
 
   let(:subject){ BRocket::VersionFile.new }
+  let(:dockerfile){ File.expand_path("../Dockerfiles/Dockerfile-basic", __FILE__) }
+  let(:version_file){ File.expand_path("../Dockerfiles/VERSION", __FILE__) }
+  before{ subject.options = { dockerfile: dockerfile } }
 
   describe :init do
     it :without_arg do
@@ -16,6 +20,29 @@ describe BRocket::VersionFile do
     end
   end
 
+  describe :show do
+    it do
+      expect($stdout).to receive(:puts).with(File.read(version_file).strip)
+      subject.show
+    end
+
+    context :invalid do
+      let(:dockerfile){ File.expand_path("../Dockerfiles/Dockerfile-invalid-version", __FILE__) }
+      it do
+        expect{ subject.show }.to raise_error(BRocket::BuildError, /file not found/i)
+      end
+    end
+  end
+
+  describe :write_file do
+    it do
+      ver = "1.2.3"
+      f = double(:mock_file)
+      expect(File).to receive(:open).with(version_file, "w").and_yield(f)
+      expect(f).to receive(:puts).with(ver)
+      subject.send(:write_file, ver)
+    end
+  end
 
   {
     major: {
@@ -33,19 +60,21 @@ describe BRocket::VersionFile do
   }.each do |method_name, patterns|
 
     describe method_name do
+      let(:git){ subject.sub(BRocket::Git) }
+      before do
+        allow(BRocket::Git).to receive(:new).and_return(git)
+        allow(git).to receive(:guard_clean)
+        expect(git).to receive(:sh).with(/git add #{version_file} && git commit -m \".+\"/)
+      end
       it :without_arg do
-        allow_any_instance_of(BRocket::Git).to receive(:guard_clean)
         allow(subject).to receive(:read_file).and_return("1.2.3")
         expect(subject).to receive(:write_file).with(patterns[:without_arg])
-        allow_any_instance_of(BRocket::Git).to receive(:commit).with("VERSION", instance_of(String))
         subject.send(method_name)
       end
 
       it :with_arg do
-        allow_any_instance_of(BRocket::Git).to receive(:guard_clean)
         allow(subject).to receive(:read_file).and_return("1.2.3")
         expect(subject).to receive(:write_file).with(patterns[:with_arg])
-        allow_any_instance_of(BRocket::Git).to receive(:commit).with("VERSION", instance_of(String))
         subject.send(method_name, "5")
       end
     end

data/spec/spec_helper.rb

@@ -1,2 +1,20 @@
+if ENV["COVERAGE"] =~ /true|yes|on|1/i
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::RcovFormatter
+  ]
+  SimpleCov.start do
+    add_filter "spec/"
+  end
+end
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'brocket'
+
+logpath = File.expand_path("../../tmp/test.log", __FILE__)
+require 'fileutils'
+FileUtils.mkdir_p(File.dirname(logpath))
+BRocket.logger = Logger.new(logpath)
+

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: brocket
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - akima
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: thor
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+  name: logger_pipe
   prerelease: false
+  type: :runtime
   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'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,15 +100,31 @@ files:
 - lib/brocket.rb
 - lib/brocket/base.rb
 - lib/brocket/cli.rb
+- lib/brocket/configurable.rb
 - lib/brocket/docker.rb
 - lib/brocket/git.rb
 - lib/brocket/version.rb
 - lib/brocket/version_file.rb
 - spec/brocket/Dockerfiles/Dockerfile-basic
+- spec/brocket/Dockerfiles/Dockerfile-gcr
 - spec/brocket/Dockerfiles/Dockerfile-git-tag
 - spec/brocket/Dockerfiles/Dockerfile-hook
+- spec/brocket/Dockerfiles/Dockerfile-invalid-version
+- spec/brocket/Dockerfiles/Dockerfile-working_dir
+- spec/brocket/Dockerfiles/VERSION
+- spec/brocket/base_spec.rb
 - spec/brocket/docker_spec.rb
 - spec/brocket/git_spec.rb
+- spec/brocket/multi_app_proj/README.md
+- spec/brocket/multi_app_proj/app1/docker/Dockerfile
+- spec/brocket/multi_app_proj/app1/docker/VERSION.txt
+- spec/brocket/multi_app_proj/app2/Dockerfile
+- spec/brocket/multi_app_proj/app2/VERSION
+- spec/brocket/multi_app_proj_spec.rb
+- spec/brocket/test_gem/Dockerfile
+- spec/brocket/test_gem/README.md
+- spec/brocket/test_gem/lib/test_gem/version.rb
+- spec/brocket/test_gem_spec.rb
 - spec/brocket/version_file_spec.rb
 - spec/brocket_spec.rb
 - spec/spec_helper.rb
@@ -116,7 +132,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,17 +147,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: supports to build Docker Container with VERSION
 test_files:
 - spec/brocket/Dockerfiles/Dockerfile-basic
+- spec/brocket/Dockerfiles/Dockerfile-gcr
 - spec/brocket/Dockerfiles/Dockerfile-git-tag
 - spec/brocket/Dockerfiles/Dockerfile-hook
+- spec/brocket/Dockerfiles/Dockerfile-invalid-version
+- spec/brocket/Dockerfiles/Dockerfile-working_dir
+- spec/brocket/Dockerfiles/VERSION
+- spec/brocket/base_spec.rb
 - spec/brocket/docker_spec.rb
 - spec/brocket/git_spec.rb
+- spec/brocket/multi_app_proj/README.md
+- spec/brocket/multi_app_proj/app1/docker/Dockerfile
+- spec/brocket/multi_app_proj/app1/docker/VERSION.txt
+- spec/brocket/multi_app_proj/app2/Dockerfile
+- spec/brocket/multi_app_proj/app2/VERSION
+- spec/brocket/multi_app_proj_spec.rb
+- spec/brocket/test_gem/Dockerfile
+- spec/brocket/test_gem/README.md
+- spec/brocket/test_gem/lib/test_gem/version.rb
+- spec/brocket/test_gem_spec.rb
 - spec/brocket/version_file_spec.rb
 - spec/brocket_spec.rb
 - spec/spec_helper.rb
+has_rdoc: