conjur-debify 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c3f31195f67e19a4a873ae02840341359c7cae
-  data.tar.gz: d9c911de42f4f6d74b8c914ea6b0270847aba71c
+  metadata.gz: 6ae28b40382a96cd6b228e7e502dbfd6ce85abdf
+  data.tar.gz: a4988e1ee9958bfc0dd3a0c36adff325c53af22b
 SHA512:
-  metadata.gz: 68eabdc03f12982d3f617138c65ee2692574a87ec868b28d5cac1d31457803ca27870686f24509b8c1d145c018e77d9154d93aa68dda97443c1a1767ba91fba7
-  data.tar.gz: 6100c22bdac5930aca377b2191822da5c229965a197f5a4cb6fdee002ab52bb1ec32045bd24b9f99cad3ef755531ac83271fbc4f28057c7323792eeee656023a
+  metadata.gz: 03f604f27e8180ee7b3dbc686b23a7e489732ba75439432f3840c26180451c813cabd29ea3dad407d9cc1e25140a79862936e8e0df130ac0bb8b977f78c3ff5e
+  data.tar.gz: 8904097e5befe3e5f3e2b463e58578e1d2b7f8db9e643019fea1bd023c5f2b1447db72491fb1ed575cf448a98041338bf4761a8a1af1ec63ba4b5d01bd96b54e

data/features/debify.feature

@@ -16,6 +16,6 @@ Feature: Packaging
 	@announce-output
 	Scenario: 'example' project can be tested successfully
 		Given I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example -v 0.0.1 example -- --post-install /distrib/postinstall.sh`
-		When I run `env DEBUG=true GLI_DEBUG=true debify test -t 4.6-stable -v 0.0.1 -d ../../example --no-pull example test.sh`
+		When I run `env DEBUG=true GLI_DEBUG=true debify test -t 4.7-stable -v 0.0.1 -d ../../example --no-pull example test.sh`
 		Then the exit status should be 0
 		And the stderr should contain "Test succeeded"

data/lib/conjur/debify.rb

@@ -5,6 +5,16 @@ require 'gli'
 
 include GLI::App
 
+config_file '.debifyrc'
+
+desc 'Set an environment variable (e.g. TERM=xterm) when starting a container'
+flag [:env], :multiple => true
+
+desc 'Mount local bundle to reuse gems from previous installation'
+default_value true
+switch [:'local-bundle']
+
+
 Docker.options[:read_timeout] = 300
 
 # This is used to turn on DEBUG notices.
@@ -33,11 +43,17 @@ module DebugMixin
       debug a.last
     else
        a.each do |line|
-         line = JSON.parse(line)
-         line.keys.each do |k|
-           debug line[k]
-         end
-       end
+        begin
+          line = JSON.parse(line)
+          line.keys.each do |k|
+            debug line[k]
+          end
+        rescue JSON::ParserError
+          # Docker For Mac is spitting out invalid JSON, so just print
+          # out the line if parsing fails.
+          debug line
+        end
+      end
     end
   end
 
@@ -324,7 +340,10 @@ command "test" do |c|
 
   c.desc "Specify the deb version; by default, it's computed from the Git tag"
   c.flag [ :v, :version ]
-        
+
+  c.desc "Specify link for test container"
+  c.flag [ :l, :link ], :multiple => true
+
   c.action do |global_options,cmd_options,args|
     raise "project-name is required" unless project_name = args.shift
     raise "test-script is required" unless test_script = args.shift
@@ -387,13 +406,17 @@ RUN touch /etc/service/conjur/down
           "CONJUR_ADMIN_PASSWORD=secret",
         ],
         'Binds' => [
-          [ dir, "/src/#{project_name}" ].join(':'),
-          [ vendor_dir, "/src/#{project_name}/vendor" ].join(':'),
-          [ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':')
+          [ dir, "/src/#{project_name}" ].join(':')
         ]
       }
       options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
-      
+      options['Links'] = cmd_options[:link] if cmd_options[:link] && !cmd_options[:link].empty?
+      if global_options[:'local-bundle']
+        options['Binds']
+          .push([ vendor_dir, "/src/#{project_name}/vendor" ].join(':'))
+          .push([ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':'))
+      end
+
       container = Docker::Container.create(options)
       
       begin
@@ -411,8 +434,13 @@ RUN touch /etc/service/conjur/down
           break if exitcode == 0 && status =~ /^run\:/
           sleep 1
         end
-        
-        container_command container, "/opt/conjur/evoke/bin/test-install", project_name
+
+        # If we're not using shared gems, run dev-install instead of
+        # test-install. Even having to reinstall all the gems is
+        # better than dealing with Docker For Mac's current file
+        # sharing performance.
+        install_cmd = global_options[:'local-bundle'] ? 'test-install' : 'dev-install'
+        container_command container, "/opt/conjur/evoke/bin/#{install_cmd}", project_name
 
         DebugMixin.debug_write "Starting conjur\n"
 
@@ -423,6 +451,7 @@ RUN touch /etc/service/conjur/down
         system "./#{test_script} #{container.id}"
         exit_now! "#{test_script} failed with exit code #{$?.exitstatus}", $?.exitstatus unless $?.exitstatus == 0
       ensure
+        DebugMixin.debug_write "deleting container"
         container.delete(force: true) unless cmd_options[:keep]
       end
     end
@@ -438,7 +467,7 @@ variables setup for the local environment (appliance URL, cert path, admin usern
 password, etc). The project source tree is also mounted into the container, at
 /src/<project-name>, where <project-name> is taken from the name of the current working directory.
 
-Once in the containter, use "/opt/conjur/evoke/bin/dev-install" to install the development bundle of your project.
+Once in the container, use "/opt/conjur/evoke/bin/dev-install" to install the development bundle of your project.
 DESC
 command "sandbox" do |c|
   c.desc "Set the current working directory"
@@ -452,12 +481,23 @@ command "sandbox" do |c|
   c.flag [ :t, "image-tag"]
 
   c.desc "Bind another source directory into the container. Use <src>:<dest>, where both are full paths."
-  c.flag [ :"bind" ]
+  c.flag [ :"bind" ], :multiple => true
   
   c.desc "'docker pull' the Conjur container image"
   c.default_value false
   c.switch [ :pull ]
 
+  c.desc "Specify link for container"
+  c.flag [ :l, :link ], :multiple => true
+
+  c.desc 'Run dev-install in /src/<project-name>'
+  c.default_value false
+  c.switch [:'dev-install']
+
+  c.desc 'Kill previous sandbox container'
+  c.default_value false
+  c.switch [:kill]
+
   c.action do |global_options,cmd_options,args|
     raise "Receive extra command-line arguments" if args.shift
     
@@ -491,21 +531,37 @@ command "sandbox" do |c|
           "CONJUR_ENV=appliance",
           "CONJUR_AUTHN_API_KEY=secret",
           "CONJUR_ADMIN_PASSWORD=secret",
-        ],
+        ] + global_options[:env],
         'Binds' => [
           [ File.expand_path(".ssh/id_rsa", ENV['HOME']), "/root/.ssh/id_rsa", 'ro' ].join(':'), 
           [ dir, "/src/#{project_name}" ].join(':'),
-          [ vendor_dir, "/src/#{project_name}/vendor" ].join(':'),
-          [ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':')
         ] + Array(cmd_options[:bind])
       }
+      if global_options[:'local-bundle']
+        options['Binds']
+          .push([ vendor_dir, "/src/#{project_name}/vendor" ].join(':'))
+          .push([ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':'))
+      end
+
       options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
+      options['Links'] = cmd_options[:link] unless cmd_options[:link].empty?
+
+      if cmd_options[:kill]
+        previous = Docker::Container.get(options['name']) rescue nil
+        previous.delete(:force => true) if previous
+      end
 
       container = Docker::Container.create(options)
       $stdout.puts container.id
       container.start
 
       wait_for_conjur appliance_image, container
+
+      if cmd_options[:'dev-install']
+        container_command(container, "/opt/conjur/evoke/bin/dev-install", project_name)
+        container_command(container, 'sv', 'restart', "conjur/#{project_name}")
+      end
+
     end
   end
 end

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli