dockit 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc496e5bf8f5c912f8a3105e3db791fe7c57ea50
-  data.tar.gz: cd44a787027339c6070ee8573eb060385cc0e9e4
+  metadata.gz: 45cc314a486066a7baf975bf2a3daa35a155f270
+  data.tar.gz: ee77b112660f1afc6e00ed451e9a1cbd41dc2ef5
 SHA512:
-  metadata.gz: a3e30d0251b5df21698ffca79376e75e3362d5da8b0ba2e29a5aebb9d8ad715ee4b3ebaabb4d56e60308b0ef22eca3a46a92f14ab8d4ddc04113b457519fe671
-  data.tar.gz: f30dbea4b6fcc6fa5b053840faa251b7fa22a777672d282fa19919e29c2b290edd87a35ac2d4e91d7090a872524cfb0a4d379f41358903712361decbe3cc786e
+  metadata.gz: 60b2561d45ab2edd536270781254430cc209b5210797ad845ff057246f0bbe1ca54fe492630776bff6cbb59dd285ed1645b7568dd026516c247053aa682cc88b
+  data.tar.gz: 4337a64438d9495e9f8b97f5688466ccf75d912713e290c1bec90275bda66f32f9629100b03f2985444fcfacd3db4a74a3796129c93d2793eaa9d69539ddfc65

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM cybercode/alpine-ruby:2.3
-ENV DOCKER_VERSION=1.11.1 BIN=/usr/local/bin/docker
+ENV DOCKER_VERSION=1.11.2 BIN=/usr/local/bin/docker
 
 RUN apk --update add curl ruby-json && curl -sSL -o $BIN \
     https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION \

data/README.md

@@ -79,7 +79,7 @@ The `dockit.rb` file can be used to add new subcommands to the cli on a project-
 
 - `invoke_default(service)` will run the same-named (or specified) dockit command on the specified service.
 - `invoke_service(service)` will run the same-named (or specifed) subcommand from the `Dockit.rb` for the specified service.
-- `invoke_git(service, gem=false)` will run the same-name (or specifed) subcommand from the `Dockit.rb` for the specified service after checking out the git repository for the service as a gzip archive to `repos.tar.tz`. By default it used the `master` branch. If `gem` is true, it will checkout the gemfiles as a separate archive (`gemfiles.tar.gz`). Note that the `repos` key must be set in the services yaml file.
+- `invoke_git(service)` will run the same-name (or specifed) subcommand from the `Dockit.rb` for the specified service after checking out the git repository for the service as a gzip archive to `repos.tar.tz`. By default it used the `master` branch. Note that the `repos` key must be set in the services yaml file.
 
 For example:
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+3.0.0

data/lib/dockit/cli.rb

@@ -27,8 +27,8 @@ class SubCommand < Thor
     end
 
     # export git repository before running default command
-    def invoke_git(service, gem=false)
-      invoke_default service, cmd: 'git-build', opts: { gem: gem || options.gem }
+    def invoke_git(service)
+      invoke_default service, cmd: 'git-build'
     end
   end
 end
@@ -182,9 +182,11 @@ class Default < Thor
     end
   end
 
-  desc 'git-build', 'build from git (gem) repository'
+  desc 'git-build', 'build from git repository'
   option :branch, desc: '<tree-ish> git reference', default: GIT_BRANCH
-  option :package, type: :boolean, desc: "update package config export"
+  option :package, type: :boolean, desc: 'update package config export'
+  option :tag, type: :boolean,
+         desc: 'create local tag file ".branch" with branch name'
   long_desc <<-LONGDESC
      Dockit.yaml keys used:
      \x5 repos_path: optional treeish path
@@ -196,7 +198,7 @@ class Default < Thor
 
      The '--package' option will export the files in the :package key in
      Dockit.yaml separately to 'package.tar.gz'. This is docker best practice
-     for building rails apps.
+     for building rails apps, and works equally well for nodejs.
 
      *Breaking change (2.0)* ~branch~ now defaults to the *current* local
       branch, not ~master~.
@@ -223,14 +225,17 @@ class Default < Thor
           exit 1
         end
 
-        archive  = options.gem ? 'gemfile.tar.gz' : 'package.tar.gz'
-        say "-> #{archive}", :green
-        export(repos, treeish, archive, packages)
+        archive  = ''
+        say '-> package.tar.gz', :green
+        export(repos, treeish, archive, 'package.tar.gz')
       end
 
-      say "-> repos.tar.gz", :green
+      say '-> repos.tar.gz', :green
       export(repos, treeish, 'repos.tar.gz')
 
+      say "Creating '.branch' tag file (#{options.branch})", :green
+      File.write('.branch', "#{options.branch}\n")
+
       s.build
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,4 +207,3 @@ test_files:
 - spec/dockit/simple.yaml
 - spec/dockit_spec.rb
 - spec/spec_helper.rb
-has_rdoc: