dockerhelper 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb11a7f10e11248eaf1ff08f253c41e5352bfc6
-  data.tar.gz: e663a7ddf2acaf0b77f8531f37998f5b982df1e3
+  metadata.gz: 9178187c9e138e25855fd94d4d748f3ec5ba8b23
+  data.tar.gz: 87f038059e71d699b79c678cc9f581f22141b625
 SHA512:
-  metadata.gz: 0211dbcba6b420356d5b991469790edb34ec41fb85ea779f05f15a1df6032c6ca01f4b4654166ce8788c66c0597ed50852980df35982ed94fa319efca46de96c
-  data.tar.gz: a19c400f9515c7fb49772ddced168f5731b479d9c60603c8bd218da8b792bb4a55243249241166c34c128fe8d794f49c045b7070ad8957586e0c03b0a1592927
+  metadata.gz: e5cb7334b53cc21763ea48a91bcc05237e67d65708e9210071f5a73d8a739f96873a2afa9a6ce79e3a91e4eb5c5281ca421c7dd7f027c7fb28124e697a61c5df
+  data.tar.gz: 02744ba8492b5ba8aa96f2218fd6b0d9e5258ea9c43793118ef07f611d7fc52ffc6268e8dc7371103710c582c056b1d570a350527e65c90d876979dad6c426b5

data/README.md

@@ -41,6 +41,7 @@ config = Dockerhelper.configure do |c|
   c.docker_repo_tag_prefix  = 'prd-'
   c.kube_rc_template        = File.expand_path('../project-rc.yml.erb', __FILE__)
   c.kube_rc_dest_dir        = File.dirname(__FILE__)
+  c.env_vars                = %w(REQUIRED_ENV_VAR)
 end
 
 Dockerhelper::Tasks.init(config)

data/lib/dockerhelper.rb

@@ -12,8 +12,6 @@ module Dockerhelper
   module_function :cmd
 
   def self.configure(&block)
-    config = Config.new
-    block.call(config)
-    config
+    Config.new.tap(&block).tap(&:check_env_vars!)
   end
 end

data/lib/dockerhelper/config.rb

@@ -13,6 +13,9 @@ module Dockerhelper
     attr_accessor :environment
     attr_accessor :kube_rc_template
     attr_accessor :kube_rc_dest_dir
+    attr_accessor :kube_rc_version
+    attr_accessor :env_vars
+    attr_accessor :prebuild_command
 
     def initialize
       # defaults
@@ -28,6 +31,10 @@ module Dockerhelper
       @docker ||= Docker.new(chdir: git_root)
     end
 
+    def kubernetes?
+      @kube_rc_template && @kube_rc_dest_dir
+    end
+
     def kubernetes
       @kubernetes ||= Kubernetes.new(self)
     end
@@ -35,5 +42,20 @@ module Dockerhelper
     def docker_repo_tag
       @docker_tag || "#{docker_repo_tag_prefix}#{git.latest_rev}"
     end
+
+    def check_env_vars!
+      return unless env_vars
+      unless env_vars.respond_to?(:reject)
+        raise ArgumentError.new('Expected an array of env_vars')
+      end
+      undefined = env_vars.reject(&ENV.method(:has_key?))
+      unless undefined.empty?
+        raise StandardError.new("The environment must define #{undefined.join ', '}")
+      end
+    end
+
+    def prebuild?
+      prebuild_command && !prebuild_command.empty?
+    end
   end
 end

data/lib/dockerhelper/kubernetes.rb

@@ -13,7 +13,7 @@ module Dockerhelper
     end
 
     def app_version
-      config.docker_repo_tag
+      config.kube_rc_version || config.docker_repo_tag
     end
 
     def app_full_name
@@ -39,8 +39,7 @@ module Dockerhelper
     end
 
     def replication_controller_delete
-      Command.new("kubectl delete -f #{replication_controller_filename}",
-        label: 'kubectl-delete-rc').run
+      Command.new("kubectl delete rc #{current_rc}", label: 'kubectl-delete-rc').run
     end
 
     def replication_controller_yaml

data/lib/dockerhelper/rake.rb

@@ -5,14 +5,21 @@ module Dockerhelper
     extend ::Rake::DSL
 
     def self.init(config)
+      build_tasks = [:pull, :docker_build, :repo_tag, :push]
+      build_tasks << :'kube:gen_rc' if config.kubernetes?
+
       namespace :docker do
         namespace(config.environment) do
-
           desc 'Print config info'
           task :info do
             puts config.inspect
           end
 
+          desc 'Prepare to build docker image'
+          task :prebuild do
+            Command.new(config.prebuild_command, label: 'prebuild').run if config.prebuild?
+          end
+
           desc 'Build docker image'
           task :docker_build do
             config.docker.build(config.dockerfile, tag: config.docker_image)
@@ -35,34 +42,36 @@ module Dockerhelper
           end
 
           desc 'Git clone, build image, and push image to Docker Hub'
-          task :build => [:pull, :docker_build, :repo_tag, :push, 'kube:gen_rc']
+          task :build => build_tasks
 
-          namespace :kube do
-            desc 'Generate replication controller for the current build'
-            task :gen_rc do
-              config.kubernetes.write_replication_controller
-              puts "Created replication-controller: #{config.kubernetes.replication_controller_filename}"
-            end
+          if config.kubernetes?
+            namespace :kube do
+              desc 'Generate replication controller for the current build'
+              task :gen_rc do
+                config.kubernetes.write_replication_controller
+                puts "Created replication-controller: #{config.kubernetes.replication_controller_filename}"
+              end
 
-            desc 'Get current replication controller version'
-            task :current_rc do
-              puts config.kubernetes.current_rc
-            end
+              desc 'Get current replication controller version'
+              task :current_rc do
+                puts config.kubernetes.current_rc
+              end
 
-            desc 'Run replication controller rolling-update'
-            task :rolling_update => [:gen_rc] do
-              config.kubernetes.rolling_update
-            end
+              desc 'Run replication controller rolling-update'
+              task :rolling_update => [:gen_rc] do
+                config.kubernetes.rolling_update
+              end
 
-            desc 'Create replication controller'
-            task :create_rc => [:gen_rc] do
-              config.kubernetes.replication_controller_create
-            end
+              desc 'Create replication controller'
+              task :create_rc => [:gen_rc] do
+                config.kubernetes.replication_controller_create
+              end
 
-            desc 'Delete replication controller (USE WITH CAUTION)'
-            task :delete_rc do
-              # TODO add "are you sure?" prompt
-              config.kubernetes.replication_controller_delete
+              desc 'Delete replication controller (USE WITH CAUTION)'
+              task :delete_rc do
+                # TODO add "are you sure?" prompt
+                config.kubernetes.replication_controller_delete
+              end
             end
           end
         end
@@ -70,4 +79,3 @@ module Dockerhelper
     end
   end
 end
-

data/lib/dockerhelper/version.rb

@@ -1,3 +1,3 @@
 module Dockerhelper
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerhelper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Josh McDade
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler