conjur-debify 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a88bd846714166dd0d608553936e84045ce0af
-  data.tar.gz: 4dc3afd7a054006c55b33ed0de011c17b8d2626b
+  metadata.gz: 90432693c649a1eb23de7b962899831314859166
+  data.tar.gz: 3a690c6eecbf7dc1c8874321fad63b27775faa3d
 SHA512:
-  metadata.gz: 0fb023e1ed3f7edbe8f5428cedee4c2caf8f8a110031ba5d339268f9deb2100e411c9e28df8e59067c23c207acd515b26f5eab738d1c737e625af597f5f16f19
-  data.tar.gz: 2eff9c0a810e029252d419b9461a76442cf18e623f28d6e58fe6460b031f98d8948b638839728d782330acad62df50707a6edccabf893a7cdade80fcbeab0e88
+  metadata.gz: 7bda53b7b5ba6895e6d0e1ab4b65c39006c6cbec431d14e4b82387148457e9107c70da4acb14a8d8e020b3015f1cf0b35fb35f7d1b5b0b2c0870499611f41312
+  data.tar.gz: 26176ae31025c4559be428ff3fdf8c4545689379f876a5a8e9d31559119ee980206de3a0412c226f513cbabed6d9dc2b4541a479579ccedb05d5714c74ea3047

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.8.0
+
+* Remove the need for a 'latest' debian
+* Fix bug in the error message for 'detect_version'
+* Use a more reliable way to detect the current branch
+* `publish` : Remove the default value of the 'component' flag
+* `clean` : Don't create a container unless deletions will actually be performed
+
 # 0.7.0
 
 * Add `debify clean`

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 -d ../../example --no-pull example test.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`
 		Then the exit status should be 0
 		And the stderr should contain "Test succeeded"

data/lib/conjur/debify.rb

@@ -54,7 +54,7 @@ arguments :strict
 
 def detect_version
   `git describe --long --tags --abbrev=7 | sed -e 's/^v//'`.strip.tap do |version|
-    raise "No Git version (tag) for project '#{project_name}'" if version.empty?
+    raise "No Git version (tag) for project" if version.empty?
   end
 end
 
@@ -119,32 +119,34 @@ command "clean" do |c|
       delete_files.delete_if{|file| 
         File.directory?(file) || ignore_file?(file)
       }
-      image = Docker::Image.create 'fromImage' => "alpine:3.3"
-      options = {
-        'Cmd'   => [ "sh", "-c", "while true; do sleep 1; done" ],
-        'Image' => image.id,
-        'Binds' => [
-          [ dir, "/src" ].join(':'),
-        ]
-      }
-      container = Docker::Container.create options
-      begin
-        container.start
-        delete_files.each do |file|
-          $stderr.puts file
-          
-          file = "/src/#{file}"
-          cmd = if perform_deletion
-            [ "rm", "-f", file ]
-          else
-            [ "echo", file ]
+      if perform_deletion
+        image = Docker::Image.create 'fromImage' => "alpine:3.3"
+        options = {
+          'Cmd'   => [ "sh", "-c", "while true; do sleep 1; done" ],
+          'Image' => image.id,
+          'Binds' => [
+            [ dir, "/src" ].join(':'),
+          ]
+        }
+        container = Docker::Container.create options
+        begin
+          container.start
+          delete_files.each do |file|
+            puts file
+            
+            file = "/src/#{file}"
+            cmd = [ "rm", "-f", file ]
+            
+            stdout, stderr, status = container.exec cmd, &DebugMixin::DOCKER
+            $stderr.puts "Failed to delete #{file}" unless status == 0
           end
-          
-          stdout, stderr, status = container.exec cmd, &DebugMixin::DOCKER
-          $stderr.puts "Failed to delete #{file}" unless status == 0
+        ensure
+          container.delete force: true
+        end
+      else
+        delete_files.each do |file|
+          puts file
         end
-      ensure
-        container.delete force: true
       end
     end
   end
@@ -238,7 +240,6 @@ command "package" do |c|
         tar = Gem::Package::TarReader.new deb
         tar.first.tap do |entry|
           open(entry.full_name, 'wb') {|f| f.write(entry.read)}
-          FileUtils.ln_sf entry.full_name, entry.full_name.gsub(version, "latest")
           puts entry.full_name
         end
       ensure
@@ -258,7 +259,7 @@ password, etc). The project source tree is also mounted into the container, at
 /src/<project-name>.
 
 This command then waits for Conjur to initialize and be healthy. It proceeds by
-installing the conjur-<project-name>_latest_amd64.deb from the project working directory.
+installing the conjur-<project-name>_<version>_amd64.deb from the project working directory.
 
 Then the evoke "test-install" command is used to install the test code in the 
 /src/<project-name>. Basically, the development bundle is installed and the database
@@ -285,10 +286,13 @@ command "test" do |c|
   c.desc "Image tag, e.g. 4.5-stable, 4.6-stable"
   c.flag [ :t, "image-tag"]
   
-  c.desc "Pull the image, even if it's in the Docker engine already"
+  c.desc "'docker pull' the Conjur container image"
   c.default_value true
   c.switch [ :pull ]
-    
+
+  c.desc "Specify the deb version; by default, it's computed from the Git tag"
+  c.flag [ :v, :version ]
+        
   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
@@ -303,24 +307,25 @@ command "test" do |c|
     Dir.chdir dir do
       image_tag = cmd_options["image-tag"] or raise "image-tag is required"
       appliance_image_id = [ cmd_options[:image], image_tag ].join(":")
+      version = cmd_options[:version] || detect_version
+      package_name = "conjur-#{project_name}_#{version}_amd64.deb"
         
       raise "#{test_script} does not exist or is not a file" unless File.file?(test_script)
       
       Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
       
-      def build_test_image(appliance_image_id, project_name)
-        deb = "conjur-#{project_name}_latest_amd64.deb"
+      def build_test_image(appliance_image_id, project_name, package_name)
         dockerfile = <<-DOCKERFILE
 FROM #{appliance_image_id}
 
-COPY #{deb} /tmp/
+COPY #{package_name} /tmp/
 
 RUN rm -rf /opt/conjur/#{project_name}
 RUN rm -f /opt/conjur/etc/#{project_name}.conf
 RUN rm -f /usr/local/bin/conjur-#{project_name}
 
 RUN dpkg --force all --purge conjur-#{project_name} || true
-RUN dpkg --install /tmp/#{deb}
+RUN dpkg --install /tmp/#{package_name}
 
 RUN touch /etc/service/conjur/down
         DOCKERFILE
@@ -328,7 +333,7 @@ RUN touch /etc/service/conjur/down
           tmpfile = Tempfile.new('Dockerfile', tmpdir)
           File.write(tmpfile, dockerfile)
           dockerfile_name = File.basename(tmpfile.path)
-          tar_cmd = "tar -cvzh -C #{tmpdir} #{dockerfile_name} -C #{Dir.pwd} #{deb}"
+          tar_cmd = "tar -cvzh -C #{tmpdir} #{dockerfile_name} -C #{Dir.pwd} #{package_name}"
           tar = open("| #{tar_cmd}")
           begin
             Docker::Image.build_from_tar(tar, :dockerfile => dockerfile_name, &DebugMixin::DOCKER)
@@ -338,7 +343,7 @@ RUN touch /etc/service/conjur/down
         end
       end
 
-      appliance_image = build_test_image(appliance_image_id, project_name)
+      appliance_image = build_test_image(appliance_image_id, project_name, package_name)
       
       vendor_dir = File.expand_path("tmp/debify/#{project_name}/vendor", ENV['HOME'])
       dot_bundle_dir = File.expand_path("tmp/debify/#{project_name}/.bundle", ENV['HOME'])
@@ -448,7 +453,6 @@ command "publish" do |c|
   c.flag [ :v, :version ]
 
   c.desc "Maturity stage of the package, 'testing' or 'stable'"
-  c.default_value "testing"
   c.flag [ :c, :component ]
 
   c.action do |global_options,cmd_options,args|
@@ -457,10 +461,7 @@ command "publish" do |c|
     raise "Receive extra command-line arguments" if args.shift
 
     def detect_component
-      branch = ENV['GIT_BRANCH']
-      unless branch
-        branch = `git describe --all`
-      end
+      branch = ENV['GIT_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip
       if %w(master origin/master).include?(branch)
         'stable'
       else
@@ -476,7 +477,6 @@ command "publish" do |c|
     Dir.chdir dir do
       version = cmd_options[:version] || detect_version
       component = cmd_options[:component] || detect_component
-      
       package_name = "conjur-#{project_name}_#{version}_amd64.deb"
 
       publish_image = Docker::Image.build_from_dir File.expand_path('publish', File.dirname(__FILE__)), tag: "debify-publish", &DebugMixin::DOCKER

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin Gilpin