shipwright 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f094cf61c13ab0c20c6aa4a5f3db8ddab4ce13
-  data.tar.gz: 6c0f25c24201dd8c78a27bff8134e3301d0df237
+  metadata.gz: 0ba8266c86870a9a053d2e1f3de4983649ec0488
+  data.tar.gz: ee6022c06aa7103f2420b7d6fc2082e022880b8c
 SHA512:
-  metadata.gz: b058541f1bbbfe9ef5673585741c881c7075c05e74417ffe4222fd91c06d73c85010a7e0fe072bfdca274d9260b940355c9c219a1d2989b227c16a91ece5bda6
-  data.tar.gz: 906f67905dcf24afd4a4978d10e87dbe46d0df0123e6c699792eab3daa03c1c1ef19009aa3664c38a82c698a0e50f7be699312cec259a340b925bfbebb3660a7
+  metadata.gz: fa4d78b46774227fdda840f11f24499df8404f3c2a856abec249bd1ab8b9c9290f339ed7d8a51d5ae95fb58086c2707c658583bb8cd03e098e68167d59ee5fb0
+  data.tar.gz: 571ea6d27b249b36b1f15b5a22c1cc4cf70f1119f2d08db5e94cbe02ec34d9b8218da2fd2b9c5d1e3e0f45d42c659ea5b1232c0c2ae999099d5dfafefe815724

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.2.0

data/lib/shipwright/builder.rb

@@ -7,10 +7,10 @@ module Shipwright
     COMMIT_MESSAGE = "new version %s built by Shipwright #{Shipwright::VERSION}\n
     [ci skip]"
 
-    attr_accessor :path, :commit_message, :previous_version, :version
+    attr_accessor :path, :commit_message, :previous_version, :version, :shipyard
 
-    def self.build(path)
-      new(path).build
+    def self.build(path, shipyard = nil)
+      new(path).tap { |b| b.shipyard = shipyard }.build
     end
 
     def self.bump
@@ -31,10 +31,10 @@ module Shipwright
 
     def initialize(path)
       self.path = path
-      shipyard
     end
 
     def build
+      shipyard
       self.class.init
       Shipwright.info "Shipwright is building #{path} (at #{self.class.version})"
 
@@ -113,7 +113,9 @@ module Shipwright
     end
 
     def shipyard
-      ENV.fetch('SHIPYARD') { raise "set SHIPYARD= to your docker host/scope" }
+      @shipyard ||= ENV.fetch('SHIPYARD')
+    rescue KeyError
+      raise MissingShipyardError
     end
 
     def application
@@ -128,5 +130,7 @@ module Shipwright
       @git ||= Git.open(Dir.pwd)
     end
 
+    MissingShipyardError = Class.new(StandardError)
+
   end
 end

data/lib/shipwright/cli.rb

@@ -9,9 +9,12 @@ module Shipwright
       puts "shipwright version: #{Shipwright::VERSION}"
     end
 
-    desc "build", "Build and push docker image"
-    def build(base=Dir.pwd)
-      Shipwright::Builder.build(base)
+    desc "build [base] [shipyard]", "Build and push docker image"
+    def build(base=Dir.pwd, shipyard=nil)
+      Shipwright::Builder.build(base, shipyard)
+    rescue MissingShipyardError
+      puts "Set SHIPYARD in your environment or pass it to the build command"
+      exit 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipwright
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Hunter