dockit 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e0d2cd02f77d0d0aa4b9b88e466d8fb388feba
-  data.tar.gz: 65ec572c9a6041650bcf1ded75ccb6722d667292
+  metadata.gz: 9c63b7d392b7e6a3f85e25cf63f8ed6b74938ccd
+  data.tar.gz: 0d9841ce6661fc986c240303f32df0a7d49b2082
 SHA512:
-  metadata.gz: eec1994dec78dff9b6342e0d1ce71e949ee0deedbe484a71e2c51633570c1ec3ed8d94d44f1c3846a8c00113bb1f2bd42a17445c81b7788572ccb527c3eab122
-  data.tar.gz: 2a73df495488e168d34bcfaedb16f6a64b1d7566b33e87562abee08bceb0b0cb0b13ed8994ab34c45df36830f4021b42582a06bf898aa51db308742e64a7b6f8
+  metadata.gz: '0588c22232ac3f574dacf0a7189ff8e472692571469f3f2b6ccae984e599790b80af5774ab3a77b8c2f546da90fbe13963fc55d97117e3442ddb436d9b28bffc'
+  data.tar.gz: ed2b13e3102e0fb90bb46b3e188592bb7aa18956dd175b02e9af94d52772a5cee26acb3670940f45838c6bfee04e72f61f360cf6112df33063ffe21145f0850d

data/VERSION

@@ -1 +1 @@
-4.3.0
+5.0.0

data/lib/dockit/cli.rb

@@ -179,32 +179,32 @@ class Default < Thor
     end
   end
 
-  desc 'push REGISTRY [SERVICE]', 'push image for SERVICE to REGSITRY'
+  desc 'push REGISTRY [SERVICE ...]', 'push image for SERVICE(s) to REGSITRY'
   option :force, type: :boolean, desc: 'overwrite current lastest version'
   option :tag,  desc: 'repos tag (defaults to "latest")', aliases: ['t']
-  def push(registry, service=nil)
-    exec(service) do |s|
+  def push(registry, *services)
+    exec(services) do |s|
       s.push(registry, options[:tag], options[:force])
     end
   end
 
-  desc 'pull REGISTRY [SERVICE]', 'pull image for SERVICE from REGSITRY'
+  desc 'pull REGISTRY [SERVICE ...]', 'pull image for SERVICE(s) from REGSITRY'
   option :force, type: :boolean, desc: 'overwrite current tagged version'
   option :tag,  desc: 'repos tag (defaults to "latest")', aliases: ['t']
-  def pull(registry, service=nil)
-    exec(service) do |s|
+  def pull(registry, *services)
+    exec(services) do |s|
       s.pull(registry, options[:tag], options[:force])
     end
   end
 
-  desc 'build [SERVICE]', "Build image from current directory or service name"
-  def build(service=nil)
-    exec(service) do |s|
+  desc 'build [SERVICE ...]', "Build image(s) from current directory or service name(s)"
+  def build(*services)
+    exec(services) do |s|
       s.build()
     end
   end
 
-  desc 'git-build', 'build from git repository'
+  desc 'git-build [SERVICE ...]', 'build image(s) for current directory or service(s) from git'
   option :branch, desc: '<tree-ish> git reference', default: GIT_BRANCH
   option :package, type: :boolean, desc: 'update package config export'
   option :tag, type: :boolean,
@@ -226,8 +226,8 @@ class Default < Thor
       branch, not ~master~.
   LONGDESC
 
-  def git_build(service=nil)
-    exec(service) do |s|
+  def git_build(*services)
+    exec(services) do |s|
       unless repos = s.config.get(:repos)
         say "'repos' not defined in config file. Exiting…", :red
         exit 1
@@ -282,18 +282,22 @@ class Default < Thor
     @@dockit ||= Dockit::Env.new(debug: options[:debug])
   end
 
-  def exec(service)
-    file = _file(service)
-    if file != DOCKIT_FILE
-      say "Processing #{service}"
-      # problem w/ path length for docker build, so change to local directory
-      Dir.chdir(File.dirname(file))
-    end
+  def exec(services)
+    services = [services] unless services.is_a?(Array)
+    services.push(nil) unless services.count.positive?
+    services.each do |service|
+      file = _file(service)
+      if file != DOCKIT_FILE
+        say "Processing #{service}", :blue
+        # problem w/ path length for docker build, so change to local directory
+        Dir.chdir(File.dirname(file))
+      end
 
-    locals = options[:locals]||{}
-    env = options[:env]
-    locals[:env] = env ? "-#{env}" : ""
-    yield Dockit::Service.new(locals: locals)
+      locals = options[:locals]||{}
+      locals[:env] = options[:env] || ''
+      yield Dockit::Service.new(locals: locals)
+
+    end
   end
 
   def _file(service)

data/lib/dockit/digitalocean.rb

@@ -28,14 +28,14 @@ class DO < Thor
       say  "Droplet #{options.remote} exists. Please destroy it first.", :red
       exit 1
     end
-    say "creating droplet: #{options.remote}"
+    say "creating droplet: #{options.remote}", :green
     d = client.droplets.create(DropletKit::Droplet.new(
                             name: options.remote,
                             region: options.region,
                             size: options[:size],
                             image: options[:image],
                             ssh_keys: client.ssh_keys.all.collect(&:id)))
-    say [d.id, d.status, d.name].join(' ')
+    say [d.id, d.status, d.name].join(' '), :blue
   end
 
   desc 'available', 'list available docker images'
@@ -98,14 +98,14 @@ class DO < Thor
       msg = "#{k}(#{id[0..11]}[#{name}]):"
       if ssh(options.remote, options.user,
              "docker images --no-trunc | grep #{id} > /dev/null")
-        say ". #{msg} exists"
+        say ". #{msg} exists", :blue
       else
         if options.backup
           tag = "#{name}:#{options.tag}"
-          say "#{msg} tagging as #{tag}"
+          say "#{msg} tagging as #{tag}", :green
           ssh(options.remote, options.user, "docker tag #{name} #{tag}")
         end
-        say "#{msg} pushing"
+        say "#{msg} pushing", :green
         ssh(options.remote, options.user, 'docker load', "docker save #{name}")
       end
     end
@@ -151,7 +151,7 @@ class DO < Thor
   def service(name)
     Dockit::Service.new(
       service_file(name),
-      locals: {env: options.env ? "-#{options.env}" : ''}.merge(options[:locals]||{}))
+      locals: {env: options.env || ''}.merge(options[:locals]||{}))
   end
 
   def service_file(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler