conjur-debify 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 872a2497addbf3077c3bdcd816c1c79eb8d4590b
-  data.tar.gz: f2e1d0b4ea7994c12ce8191de970746922b167ed
+  metadata.gz: f7a88bd846714166dd0d608553936e84045ce0af
+  data.tar.gz: 4dc3afd7a054006c55b33ed0de011c17b8d2626b
 SHA512:
-  metadata.gz: 8b66fa204e79535f57b74f74c5ea99b68b000a898206ea3d9cedf414b6e123caf0872196ac1afdfc4afb306f1b1668710fa996aa38989b5849ccdd53170bc28e
-  data.tar.gz: 662f804d35f35aadfbe7ca84778f5141bb68e54ab3bb242fc3ea6d8e174d391bcfd3a12803bb8f077367ea3ea12a6225c78d3f540473e46690e9738797055a89
+  metadata.gz: 0fb023e1ed3f7edbe8f5428cedee4c2caf8f8a110031ba5d339268f9deb2100e411c9e28df8e59067c23c207acd515b26f5eab738d1c737e625af597f5f16f19
+  data.tar.gz: 2eff9c0a810e029252d419b9461a76442cf18e623f28d6e58fe6460b031f98d8948b638839728d782330acad62df50707a6edccabf893a7cdade80fcbeab0e88

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 0.5.0
+# 0.7.0
+
+* Add `debify clean`
+
+# 0.6.0
 
 * `package` : Add `--dockerfile` option
 * `package` : Ensure that `Gemfile.lock` is in the container

data/features/debify.feature

@@ -6,10 +6,16 @@ Feature: Packaging
 		Then the exit status should be 0
 		And the stdout should contain exactly "conjur-example_0.0.1_amd64.deb"
 
+	@announce-output
+	Scenario: 'clean' command will delete non-Git-managed files
+		Given I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example -v 0.0.1 example -- --post-install /distrib/postinstall.sh`
+		And I successfully run `env DEBUG=true GLI_DEBUG=true debify clean -d ../../example --force`
+		And I successfully run `find ../../example`
+		Then the stdout from "find ../../example" should not contain "conjur-example_0.0.1_amd64.deb"
+
 	@announce-output
 	Scenario: 'example' project can be tested successfully
-		Given I run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example -v 0.0.1 example -- --post-install /distrib/postinstall.sh`
-		And the exit status should be 0
+		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`
 		Then the exit status should be 0
 		And the stderr should contain "Test succeeded"

data/lib/conjur/debify.rb

@@ -58,6 +58,98 @@ def detect_version
   end
 end
 
+def git_files
+  (`git ls-files -z`.split("\x0") + ['Gemfile.lock']).uniq
+end
+
+desc "Clean current working directory of non-Git-managed files"
+long_desc <<DESC
+Reliable builds depend on having a clean working directory.
+
+Because debify runs some commands in volume-mounted Docker containers,
+it is capable of creating root-owned files.
+
+This command will delete all files in the working directory that are not
+git-managed. The command is designed to run in Jenkins. Therefore, it will
+only perform file deletion if:
+
+* The current user, as provided by Etc.getlogin, is 'jenkins'
+* The BUILD_NUMBER environment variable is set
+
+File deletion can be compelled using the "force" option.
+DESC
+arg_name "project-name -- <fpm-arguments>"
+command "clean" do |c|
+  c.desc "Set the current working directory"
+  c.flag [ :d, "dir" ]
+    
+  c.desc "Ignore (don't delete) a file or directory"
+  c.flag [ :i, :ignore ]
+  
+  c.desc "Force file deletion even if if this doesn't look like a Jenkins environment"
+  c.switch [ :force ]
+    
+  c.action do |global_options,cmd_options,args|
+    def looks_like_jenkins?
+      require 'etc'
+      Etc.getlogin == 'jenkins' && ENV['BUILD_NUMBER']
+    end
+    
+    require 'set'
+    perform_deletion = cmd_options[:force] || looks_like_jenkins?
+    if !perform_deletion
+      $stderr.puts "No --force, and this doesn't look like Jenkins. I won't actually delete anything"
+    end
+    @ignore_list = Array(cmd_options[:ignore]) + [ '.', '..', '.git' ]
+     
+    def ignore_file? f
+      @ignore_list.find{|ignore| f.index(ignore) == 0}
+    end
+       
+    dir = cmd_options[:dir] || '.'
+    dir = File.expand_path(dir)
+    Dir.chdir dir do
+      require 'find'
+      find_files = []
+      Find.find('.').each do |p|
+        find_files.push p[2..-1]
+      end
+      find_files.compact!
+      delete_files = (find_files - git_files)
+      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 ]
+          end
+          
+          stdout, stderr, status = container.exec cmd, &DebugMixin::DOCKER
+          $stderr.puts "Failed to delete #{file}" unless status == 0
+        end
+      ensure
+        container.delete force: true
+      end
+    end
+  end
+end
+
 desc "Build a debian package for a project"
 long_desc <<DESC
 The package is built using fpm (https://github.com/jordansissel/fpm).
@@ -115,7 +207,7 @@ command "package" do |c|
       
       output = StringIO.new
       Gem::Package::TarWriter.new(output) do |tar|
-        (`git ls-files -z`.split("\x0") + ['Gemfile.lock']).uniq.each do |fname|
+        git_files.each do |fname|
           stat = File.stat(fname)
           tar.add_file(fname, stat.mode) { |tar_file| tar_file.write(File.read(fname)) }
         end

data/lib/conjur/debify/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli