conjur-debify 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c57a4e9688bb87a40ad356edb08469a8090ab22
-  data.tar.gz: 9ef86713510df115a32bc972117d7f46a9b1c5cc
+  metadata.gz: 863413dc994374182b930993bd5ffde122561d49
+  data.tar.gz: 6923633f277a6648113beccf29223f02bb33e7f0
 SHA512:
-  metadata.gz: 8a189d86b8e9b4de1d5d3945f0ed77934cdfdeb8155cb3a3c87438b989368608090929ef5f8ad16caa38885b605c6e7439dfb2ac3bd56eefe4d7064ddf1aaf81
-  data.tar.gz: f7cc7725dbede77c5530d25da6ea8dd87ac7a95f3ed97e1092516a0a1ac8f933756de0034bd98664d272a9e66387b2c356cc6afbd1e0b6ae49723231eb4b77e4
+  metadata.gz: 28b40585fb6aa99d324ccc1528d8ef312405107c9fa8928403af3b005d78df67ceeac59926e24a80aa370ccf8912b8917a183f35a13443a51f17ec02fba5cc5b
+  data.tar.gz: d29b58cce19559c5f7033a3c5b3706915d7ebeb2dfbef100a7a8adad6a09c2bfe8e719974bdaee86b07b435afc0d4644df2bc44e3068fa87db8d7b9ca7cda28b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.5.0
+
+* Add `detect-version` command.
+* Read version from VERSION file, if it exists.
+
 # 1.4.0
 
 * Add `--port` sandbox option

data/features/detect_version.feature

@@ -0,0 +1,7 @@
+Feature: Automatic version string
+
+  @announce-output
+  Scenario: 'example' project gets a default version
+    When I run `env DEBUG=true GLI_DEBUG=true debify detect-version -d ../../example`
+    Then the exit status should be 0
+    And the output should match /\d.\d.\d-\d-.*/

data/lib/conjur/debify.rb

@@ -68,8 +68,15 @@ subcommand_option_handling :normal
 arguments :strict
 
 def detect_version
-  `git describe --long --tags --abbrev=7 --match 'v*.*.*' | sed -e 's/^v//'`.strip.tap do |version|
-    raise "No Git version (tag) for project" if version.empty?
+  if File.exists?("VERSION") && !(base_commit = `git log --pretty='%h' VERSION | head -n 1`.strip).empty?
+    base_version = File.read("VERSION").strip
+    commits_since = `git log #{base_commit}..HEAD --pretty='%h'`.split("\n").size
+    hash = `git rev-parse --short HEAD`.strip
+    [ [ base_version, commits_since ].join('.'), hash ].join("-")
+  else
+    `git describe --long --tags --abbrev=7 --match 'v*.*.*' | sed -e 's/^v//'`.strip.tap do |version|
+      raise "No Git version (tag) for project" if version.empty?
+    end
   end
 end
 
@@ -333,7 +340,7 @@ command "test" do |c|
   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
-    raise "Receive extra command-line arguments" if args.shift
+    raise "Received extra command-line arguments" if args.shift
     
     dir = cmd_options[:dir] || '.'
     dir = File.expand_path(dir)
@@ -492,7 +499,7 @@ command "sandbox" do |c|
   c.switch [:kill]
 
   c.action do |global_options,cmd_options,args|
-    raise "Receive extra command-line arguments" if args.shift
+    raise "Received extra command-line arguments" if args.shift
     
     dir = cmd_options[:dir] || '.'
     dir = File.expand_path(dir)
@@ -592,7 +599,7 @@ command "publish" do |c|
   c.desc "Set the current working directory"
   c.flag [ :d, :dir ]
     
-  c.desc "Specify the deb package version; by default, it's computed from the Git tag"
+  c.desc "Specify the deb package version; by default, it's computed automatically"
   c.flag [ :v, :version ]
 
   c.desc "Maturity stage of the package, 'testing' or 'stable'"
@@ -601,7 +608,7 @@ command "publish" do |c|
   c.action do |global_options,cmd_options,args|
     raise "distribution is required" unless distribution = args.shift
     raise "project-name is required" unless project_name = args.shift
-    raise "Receive extra command-line arguments" if args.shift
+    raise "Received extra command-line arguments" if args.shift
 
     def detect_component
       branch = ENV['GIT_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip
@@ -662,6 +669,24 @@ command "publish" do |c|
   end
 end
   
+desc "Auto-detect and print the repository verison"
+command "detect-version" do |c|
+  c.desc "Set the current working directory"
+  c.flag [ :d, :dir ]
+  c.action do |global_options,cmd_options,args|
+    raise "Received extra command-line arguments" if args.shift
+
+    dir = cmd_options[:dir] || '.'
+    dir = File.expand_path(dir)
+    
+    raise "Directory #{dir} does not exist or is not a directory" unless File.directory?(dir)
+        
+    Dir.chdir dir do
+      puts detect_version
+    end
+  end
+end
+
 pre do |global,command,options,args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: conjur-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -116,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .project
-- .rvmrc
+- ".gitignore"
+- ".project"
+- ".rvmrc"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -131,7 +131,8 @@ files:
 - example/debify.sh
 - example/distrib/postinstall.sh
 - example/test.sh
-- features/debify.feature
+- features/detect_version.feature
+- features/package.feature
 - features/step_definitions/debify_steps.rb
 - features/support/env.rb
 - jenkins.sh
@@ -153,22 +154,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages
 test_files:
-- features/debify.feature
+- features/detect_version.feature
+- features/package.feature
 - features/step_definitions/debify_steps.rb
 - features/support/env.rb
-has_rdoc: