brocket 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30dc6163a3b7acbe9cba9792ec3a8245ee1dd674
-  data.tar.gz: c3830af93db70d56bf2b553e2ea1ee63e694ff9d
+  metadata.gz: 22fcf9e97f299b10983753dd1f74abb4ff31e78e
+  data.tar.gz: 25a8ecaa347cd4db902508ac1112b6e98bb7e9dc
 SHA512:
-  metadata.gz: aa61def37a83d76a6315b5429f97ca0d48a5048b8af736fc898cbae783d559644a595bf0f86128958b23f0424e2b54434c4ddf402d1316ad69aa4e76ad969587
-  data.tar.gz: 07afa57f839d2c32a4e8a8ea052f2d008aaa0180824ef21f1da84befe20c3b890fb166374649517a8bf4e1147a00ff41d9b7b741818b47aa44590179c4afa09c
+  metadata.gz: 20a13369ec5c253483e84cdafe5a42f194727db5fa98e37498404dfb8a9b430d409e5d43861aa2e89878c901b35ae5944287e57fc86fb7eee6a90131dc6f3d59
+  data.tar.gz: efb682c5a4332b1685af273e00a17e182a02f0ebc9911ce3a38096fc10fd79f65062a51ed51718879e00782e927f5f4b0f72c2d9c79aa3bc10129be6b715f812

data/lib/brocket/base.rb

@@ -4,8 +4,8 @@ require 'thor'
 
 module BRocket
   class Base < Thor
-    class_option :verbose, :type => :boolean
-    class_option :dryrun , :type => :boolean
+    class_option :verbose, type: :boolean, aliases: "-V"
+    class_option :dryrun , type: :boolean, aliases: "-D"
 
     no_commands do
 
@@ -15,19 +15,16 @@ module BRocket
         task
       end
 
-      def dryrun?
-        (options || {})[:dryrun]
+      def opts
+        @opts ||= options || {}
       end
 
-      def verbose?
-        (options || {})[:verbose]
+      def dryrun?
+        opts[:dryrun]
       end
 
-      def chdir(dir, &block)
-        dir ||= "."
-        verbose("cd #{dir}")
-        Dir.chdir(dir, &block)
-        verbose("cd #{Dir.pwd}")
+      def verbose?
+        opts[:verbose]
       end
 
       def verbose(msg)

data/lib/brocket/cli.rb

@@ -18,12 +18,12 @@ module BRocket
       sub(Docker).build
     end
 
-    desc "release [DIRECTORY]", "build docker image, tag it, push tag and push docker image to docker hub"
-    def release(dir = nil)
+    desc "release", "build docker image, tag it, push tag and push docker image to docker hub"
+    def release
       sub(Git).guard_clean
-      sub(Docker).build(dir)
+      sub(Docker).build
       sub(Git).push
-      sub(Docker).push(dir)
+      sub(Docker).push
     end
 
     desc "version SUBCOMMAND ...ARGS", "manage VERSION file"

data/lib/brocket/docker.rb

@@ -8,37 +8,37 @@ module BRocket
     CONFIG_LINE_SEP = "[config]".freeze
     CONFIG_LINE_HEADER = /\A\#\s*#{Regexp.escape(CONFIG_LINE_SEP)}\s?/.freeze
 
-    desc "config [DIRECTORY]", "show configurations in Dockerfile"
-    def config(dir = nil)
-      $stdout.puts(YAML.dump(config_hash(dir)))
+    desc "config", "show configurations in Dockerfile"
+    def config
+      $stdout.puts(YAML.dump(config_hash))
     end
 
-    desc "build [DIRECTORY]", "build docker image at DIRECTORY or PWD"
-    def build(dir = nil)
+    desc "build", "build docker image"
+    def build
       info("[docker build] starting")
-      dir ||= "."
-      c = config_hash(dir)
+      c = config_hash
       img_name = config_image_name(c)
-      chdir(dir) do
-        begin
-          execute(c['BEFORE_BUILD'])
-          execute("docker build -t #{img_name}:#{VersionFile.current} .")
-          execute(c['ON_BUILD_COMPLETE'])
-        rescue
-          execute(c['ON_BUILD_ERROR'])
-        ensure
-          execute(c['AFTER_BUILD'])
-        end
+      begin
+        execute(c['BEFORE_BUILD'])
+        version = sub(VersionFile).current
+        execute("docker build -t #{img_name}:#{version} .")
+        execute(c['ON_BUILD_COMPLETE'])
+      rescue
+        execute(c['ON_BUILD_ERROR'])
+        raise
+      ensure
+        execute(c['AFTER_BUILD'])
       end
       success("[docker build] OK")
     end
 
-    desc "push [DIRECTORY]", "push docker image to docker hub"
-    def push(dir = nil)
+    desc "push", "push docker image to docker hub"
+    def push
       info("[docker push] starting")
-      c = config_hash(dir || ".")
+      c = config_hash
       img_name = config_image_name(c)
-      cmd = "docker push #{img_name}:#{VersionFile.current}"
+      version = sub(VersionFile).current
+      cmd = "docker push #{img_name}:#{version}"
       sh(cmd)
       success("[docker push] OK")
     end
@@ -46,21 +46,18 @@ module BRocket
     no_commands do
       def config_image_name(c)
         img_name = (c['IMAGE_NAME'] || '').strip
-        error "No IMAGE_NAME found in #{dir}/Dockerfile. Please add `# #{CONFIG_LINE_SEP} IMAGE_NAME: [IMAGE NAME on DockerHub]` in #{dir}/Dockerfile" if img_name.empty?
+        error "No IMAGE_NAME found in Dockerfile. Please add `# #{CONFIG_LINE_SEP} IMAGE_NAME: [IMAGE NAME on DockerHub]` in Dockerfile" if img_name.empty?
         img_name
       end
 
-      def config_hash(dir = nil)
-        dir ||= "."
-        chdir(dir) do
-          content = read_file
-          lines = content.lines.select{|line| line =~ CONFIG_LINE_HEADER}.
-            map{|line| line.sub(CONFIG_LINE_HEADER, "")}
-          return (YAML.load(lines.join("\n")) || {})
-        end
+      def config_hash
+        content = read_config_file
+        lines = content.lines.select{|line| line =~ CONFIG_LINE_HEADER}.
+          map{|line| line.sub(CONFIG_LINE_HEADER, "")}
+        return (YAML.load(lines.join("\n")) || {})
       end
 
-      def read_file
+      def read_config_file
         File.read("Dockerfile")
       end
 

data/lib/brocket/git.rb

@@ -60,7 +60,9 @@ module BRocket
       end
 
       def version_tag
-        VersionFile.current
+        prefix = sub(Docker).config_hash["GIT_TAG_PREFIX"] || ""
+        version = sub(VersionFile).current
+        "%s%s" % [prefix, version]
       end
 
     end

data/lib/brocket/version.rb

@@ -1,3 +1,3 @@
 module BRocket
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/brocket/version_file.rb

@@ -5,7 +5,7 @@ module BRocket
     FILENAME = "VERSION".freeze
     INITIAL_VERSION = "0.0.1".freeze
 
-    desc "init [VERSION]", "initialize VERSION file in current directory"
+    desc "init [VERSION]", "initialize VERSION file in directory for docker"
     def init(version = nil)
       write_file(version || INITIAL_VERSION)
     end
@@ -30,24 +30,22 @@ module BRocket
       bump_on(:patch, num)
     end
 
-    class << self
-      def current
-        if File.readable?(FILENAME)
-          File.read(FILENAME).strip
-        else
-          error "File not found #{FILENAME}. You can run `#{$0} init`"
-        end
+    no_commands do
+      def filepath
+        FILENAME
       end
-    end
 
-    no_commands do
       def read_file
-        self.class.current
+        if File.readable?(filepath)
+          File.read(filepath).strip
+        else
+          raise BuildError, "File not found #{filepath}. You can run `#{$0} init`"
+        end
       end
-      private :read_file
+      alias_method :current, :read_file
 
       def write_file(version)
-        File.open(FILENAME, "w"){|f| f.puts(version) }
+        File.open(filepath, "w"){|f| f.puts(version) }
       end
       private :write_file
 
@@ -64,7 +62,7 @@ module BRocket
         ver = parts.join(".")
         ver << "-" << suffix if suffix
         write_file(ver)
-        sub(Git).commit(FILENAME, "bump up #{pos.to_s} version: #{ver}")
+        sub(Git).commit(filepath, "bump up #{pos.to_s} version: #{ver}")
         success("[git #{pos.to_s}] #{ver}")
         ver
       end

data/spec/brocket/Dockerfiles/Dockerfile-git-tag

@@ -0,0 +1,20 @@
+#
+# [config] IMAGE_NAME: "groovenauts/rails-example"
+# [config] GIT_TAG_PREFIX: containers/rails_example/
+#
+
+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/docker_spec.rb

@@ -10,8 +10,8 @@ describe BRocket::Docker do
     let(:version){ "2.3.4" }
 
     before do
-      allow(subject).to receive(:read_file).with(any_args).and_return(File.read(filepath))
-      allow(BRocket::VersionFile).to receive(:current).and_return(version)
+      allow(subject).to receive(:read_config_file).with(any_args).and_return(File.read(filepath))
+      allow_any_instance_of(BRocket::VersionFile).to receive(:current).and_return(version)
     end
 
     describe :config do
@@ -33,8 +33,8 @@ describe BRocket::Docker do
     let(:version){ "2.3.4" }
 
     before do
-      allow(subject).to receive(:read_file).with(any_args).and_return(File.read(filepath))
-      allow(BRocket::VersionFile).to receive(:current).and_return(version)
+      allow(subject).to receive(:read_config_file).with(any_args).and_return(File.read(filepath))
+      allow_any_instance_of(BRocket::VersionFile).to receive(:current).and_return(version)
     end
 
     describe :config do
@@ -62,13 +62,16 @@ describe BRocket::Docker do
       end
 
       it :error do
+        error_msg = "build error"
         expect(subject).to receive(:sh).with("abc")
         expect(subject).to receive(:sh).with("def ghi")
-        expect(subject).to receive(:sh).with("docker build -t #{image_name}:#{version} .").and_raise("build error")
+        expect(subject).to receive(:sh).with("docker build -t #{image_name}:#{version} .").and_raise(error_msg)
         expect(subject).to receive(:sh).with("baz") # not "foo bar"
         expect(subject).to receive(:sh).with("jkl")
         expect(subject).to receive(:sh).with("mno")
-        subject.build
+        expect{
+          subject.build
+        }.to raise_error(error_msg)
       end
     end
   end

data/spec/brocket/git_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe BRocket::Git do
+
+  let(:subject){ BRocket::Git.new }
+
+  describe "Dockerfile-basic" do
+    let(:filepath){ File.expand_path("../Dockerfiles/Dockerfile-git-tag", __FILE__) }
+    let(:image_name){ "groovenauts/rails-example" }
+    let(:tag_prefix){ "containers/rails_example/" }
+    let(:version){ "2.3.4" }
+
+    before do
+      allow_any_instance_of(BRocket::Docker).to receive(:read_config_file).with(any_args).and_return(File.read(filepath))
+      allow_any_instance_of(BRocket::VersionFile).to receive(:current).and_return(version)
+    end
+
+    describe :config do
+      it do
+        expect(subject.version_tag).to eq("containers/rails_example/2.3.4")
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brocket
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - akima
@@ -91,8 +91,10 @@ files:
 - lib/brocket/version.rb
 - lib/brocket/version_file.rb
 - spec/brocket/Dockerfiles/Dockerfile-basic
+- spec/brocket/Dockerfiles/Dockerfile-git-tag
 - spec/brocket/Dockerfiles/Dockerfile-hook
 - spec/brocket/docker_spec.rb
+- spec/brocket/git_spec.rb
 - spec/brocket/version_file_spec.rb
 - spec/brocket_spec.rb
 - spec/spec_helper.rb
@@ -122,8 +124,10 @@ specification_version: 4
 summary: supports to build Docker Container with VERSION
 test_files:
 - spec/brocket/Dockerfiles/Dockerfile-basic
+- spec/brocket/Dockerfiles/Dockerfile-git-tag
 - spec/brocket/Dockerfiles/Dockerfile-hook
 - spec/brocket/docker_spec.rb
+- spec/brocket/git_spec.rb
 - spec/brocket/version_file_spec.rb
 - spec/brocket_spec.rb
 - spec/spec_helper.rb