builderator 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21016d55b87697c9e9b45661275116259721d1f5
-  data.tar.gz: 6d0502c4f842812140c78fdd0c3294db60a04acc
+  metadata.gz: ec9b3b99b02e2e735e33bbc78da82f65a502f579
+  data.tar.gz: 9ec84828b5d15e715f93844328610adf09bcae7f
 SHA512:
-  metadata.gz: 97eb7cb95957c03348fb2d7814b58ef1a1ceb58dfdc643c7aedf361882f499bd1df3eec3c06520ff3914fb1b470f50b9c1eeeee3de8749ee0ab7d2dc6002cc65
-  data.tar.gz: 75840ceb5c420cbfd64896c2cfcc91976a7b99cdb1c0bfd41ba1ac8223b68bddb4060da008c10b8ddfc36918e1d61c53ce3093799e374f85181cde9fd0cdd3ee
+  metadata.gz: 9dc75e1de4d13342c15fb5f88bdfa11035aa38f884b4bf2ba94ac719a6f15139d808d6ea849896d840cc536010745c6c1d43dfef90f715f4443939932dc5f65c
+  data.tar.gz: e55a662292f305a923d1191e20ed7d2a80d91dc55d43858c9c6bb3488ef63f845ca6545745c07d5991e72742f83e6aeec51b95138d2e4ff54bdf64f4a99c8b39

data/Gemfile.lock

@@ -14,13 +14,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    ast (2.2.0)
-    aws-sdk (2.3.4)
-      aws-sdk-resources (= 2.3.4)
-    aws-sdk-core (2.3.4)
+    ast (2.3.0)
+    aws-sdk (2.3.11)
+      aws-sdk-resources (= 2.3.11)
+    aws-sdk-core (2.3.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.4)
-      aws-sdk-core (= 2.3.4)
+    aws-sdk-resources (2.3.11)
+      aws-sdk-core (= 2.3.11)
     berkshelf (4.3.3)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -56,30 +56,31 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.5.1)
-      chef-config (= 12.5.1)
-      chef-zero (~> 4.2, >= 4.2.2)
+    chef (12.7.2)
+      chef-config (= 12.7.2)
+      chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.3)
+      mixlib-authentication (~> 1.4)
       mixlib-cli (~> 1.4)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
-      net-ssh (~> 2.6)
+      net-ssh (>= 2.9, < 4.0)
       net-ssh-multi (~> 1.1)
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
-      pry (~> 0.9)
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.5.1)
+      uuidtools (~> 2.1.5)
+    chef-config (12.7.2)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.6.2)
@@ -89,7 +90,6 @@ GEM
       rack
       uuidtools (~> 2.1)
     cleanroom (1.0.0)
-    coderay (1.1.1)
     dep-selector-libgecode (1.2.0)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
@@ -114,7 +114,6 @@ GEM
     json (1.8.3)
     json_pure (1.8.3)
     libyajl2 (1.2.0)
-    method_source (0.8.2)
     minitar (0.5.4)
     mixlib-authentication (1.4.0)
       mixlib-log
@@ -126,11 +125,11 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (2.2.6)
     molinillo (0.4.5)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.4)
+    net-ssh (3.1.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -152,14 +151,11 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parser (2.3.1.0)
+    parser (2.3.1.2)
       ast (~> 2.2)
     plist (3.1.0)
     powerpack (0.1.1)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    proxifier (1.0.3)
     rack (1.6.4)
     rainbow (2.1.0)
     rake (10.5.0)
@@ -207,22 +203,21 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.0)
+    ruby-progressbar (1.8.1)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.2.1)
-    serverspec (2.34.0)
+    serverspec (2.36.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.53)
     sfl (2.2)
-    slop (3.6.0)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    specinfra (2.57.2)
+    specinfra (2.59.0)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet

data/README.md

@@ -55,6 +55,8 @@ to install required plugins for Builderator.
 
 Builderator can automatically detect versions from SCM tags, increment the latest version of an SCM branch by a variety of steps, and create new SCM tags for new versions.
 
+If the SCM has no version tags, Builderator will try to read the version from a VERSION file in the repository.
+
 [Additional documentation](docs/versioning.md) describes CLI commands, configuration, and detailed behavior.
 
 ## Generators

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/docs/versioning.md

@@ -33,12 +33,12 @@ If STEP is omitted, Builderator will scan messages of commits between HEAD and t
 
 The `autoversion` namespace has two attributes:
 
-* `create_tags BOOLEAN` enables auto-generation of SCM tags after `bump` tasks. Default `true`.
+* `create_tags BOOLEAN` enables auto-generation of SCM tags after `bump` tasks. Default `false`.
 * `search_tags` enables detection of the current version from SCM tags. Default `true`.
 
 ```ruby
 autoversion do |version|
-  version.create_tags true
+  version.create_tags false
   version.search_tags true
 end
 ```

data/lib/builderator/control/version/scm.rb

@@ -62,6 +62,10 @@ module Builderator
             providers.unshift(klass)
           end
 
+          def unregister(klass)
+            providers.delete(klass)
+          end
+
           def providers
             @providers ||= []
           end

data/lib/builderator/control/version.rb

@@ -32,6 +32,16 @@ module Builderator
       class << self
         def current
           @current ||= SCM.tags.last
+
+          if @current.nil? && Util.relative_path('VERSION').exist?
+            @current = Version.from_string(Util.relative_path('VERSION').read)
+          end
+
+          if @current.nil?
+            fail 'No current version found! Create a VERSION file or set a version tag in your SCM.'
+          end
+
+          @current
         end
 
         def set_config_version

data/lib/builderator/tasks/berkshelf.rb

@@ -12,6 +12,8 @@ module Builderator
     class Berkshelf < Thor
       include Thor::Actions
 
+      class_option :debug, :type => :boolean, :desc => 'Show debug output'
+
       def self.exit_on_failure?
         true
       end
@@ -41,6 +43,7 @@ module Builderator
         empty_directory Interface.berkshelf.vendor
 
         command = "#{Interface.berkshelf.command} vendor #{Interface.berkshelf.vendor} "
+        command << "-d " if options[:debug]
         command << "-c #{Interface.berkshelf.berkshelf_config} " unless Interface.berkshelf.berkshelf_config.nil?
         command << "-b #{Interface.berkshelf.source}"
 
@@ -55,6 +58,7 @@ module Builderator
         vendor
 
         command = "#{Interface.berkshelf.command} upload "
+        command << "-d " if options[:debug]
         command << "-c #{Interface.berkshelf.berkshelf_config} " unless Interface.berkshelf.berkshelf_config.nil?
         command << "-b #{Interface.berkshelf.source}"
 

data/rvm.env

@@ -1,14 +1,14 @@
-declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-1"
-declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-1:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
+declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3"
+declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
 declare -x HOME="/home/jenkins"
-declare -x HUDSON_COOKIE="84805bab-9ad6-4496-9036-833e511db870"
+declare -x HUDSON_COOKIE="e12399cc-9dd6-47e7-8fea-246675a1fc27"
 declare -x IRBRC="/home/jenkins/.rvm/rubies/ruby-2.1.5/.irbrc"
 declare -x LANG="en_US.UTF-8"
 declare -x LC_ALL="en_US.UTF-8"
 declare -x MY_RUBY_HOME="/home/jenkins/.rvm/rubies/ruby-2.1.5"
 declare -x NLSPATH="/usr/dt/lib/nls/msg/%L/%N.cat"
 declare -x OLDPWD
-declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-1/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
 declare -x PWD="/home/jenkins/workspace/gem-public-builderator-master"
 declare -x RUBY_VERSION="ruby-2.1.5"
 declare -x SHLVL="1"

data/spec/version_spec.rb

@@ -24,6 +24,19 @@ module Builderator
         end
       end
 
+      ## Test stub with no history
+      module NoHistory
+        extend SCM
+
+        def self.supported?
+          true
+        end
+
+        def self._history
+          []
+        end
+      end
+
       ## Disable the Git provider
       module Git
         extend SCM
@@ -33,6 +46,33 @@ module Builderator
         end
       end
 
+      RSpec.describe Builderator::Control::Version do
+        before(:context) do
+          SCM.unregister(Test)
+          SCM.register(NoHistory)
+        end
+
+        after(:context) do
+          SCM.unregister(NoHistory)
+          SCM.register(Test)
+        end
+
+        context 'current' do
+          it 'provides an error message if no version is found' do
+            version_file = Util.relative_path('VERSION')
+            version_file.delete if version_file.exist?
+
+            expect(SCM.tags.last).to be_nil
+            expect { Version.current }.to raise_error RuntimeError
+          end
+
+          it 'falls back to VERSION file if no tags are found' do
+            Util.relative_path('VERSION').write('1.2.3')
+            expect(Version.current).to be == Version.from_string('1.2.3')
+          end
+        end
+      end
+
       SCM.register(Test)
 
       RSpec.describe Builderator::Control::Version do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake