omnibus 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQ1NWQyMTRmYTExYjZiNTg1OGMzYWZjNDlkOWIzNjlhN2E3NmM1Nw==
+    ZTkxMzRjMmQ2ZmZhZGE4YjBiYzdjOTllOTBhYzFhMDc5ODY0OThhNQ==
   data.tar.gz: !binary |-
-    OWRkMzNiOTI5YWMxZGFmNjU1OGI2Y2U2YzlkMDI2ZTE4NWE0Mzc0NA==
+    ZmIzYjRiNDdjNDkyYzVhMGY4YTk3ODNiMmVjYTg4YjVlMWE2MDE0YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDZlNjA3N2MyMjViOTVhMGM2OGNlZWE3YTRhYmVhNDk5MWMxY2IxOTgzNjli
-    NWE0OTZkYjNlOThjYjhkNWVlYjhkOWIzOWZmYzAxNzU0MzAxYWMxY2ZhZGRk
-    MGQwOWQ3NWI3Yjc3NzUzNDM2Nzk0MmU5MDE4ZjhkYjliNTU3OTc=
+    ZjljYzFjNTU4MDI2NDY5YzRhZmEwNjcyOTA4ZmRiNGE1YWVmYThmYzhmOGI3
+    NGEwMWZlNDI0YzdjZmY5OTg5YWQ1MjAwOTM4Y2I3MTgxNmJhMjQ4YWI2MDhl
+    MjU4OTVlN2E3Zjc4YTY5YjQ2MTNmMmU2MzRjOWVjZTYyOTg3ZmE=
   data.tar.gz: !binary |-
-    ZmYyOWVkZDljYTkzMDIwNWQ1NmFjNTA4MGZmMDc4NzkxNjAxYjUzM2RlMmFj
-    NTcwYjExZDc0ZmEzZTQwOTkwOWRlZjdjZjdhYjVlYTczMThlMGJjMGJjODJj
-    NWVhZjFlZjg2ZTVmNjgyZmZmZjQ3ZjlmZjRlNTBmYmQ2ODg5Yzg=
+    MDEzMmM5MzRiZjM4YWQ4ZTE3NjMxYTkxNjNiYjYxM2RkYmFiNWRiYjk4YjRi
+    Zjk0ZGNmNjM1YjhmZDI3ZDU4YjZlMWZmMTc3N2Y3MzNmMGMyNWQxOGFlNWNk
+    MmY0NTljMzdjNTI2NjAwNWVkOGE3MGRmYmExODU5NjY2MTliYjQ=

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: rake spec

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.2 (April 23, 2013)
+
+IMPROVEMENTS:
+
+* Travis CI support
+
+BUG FIXES:
+
+* [CHEF-4112] `omnibus build project` command does not respect the
+  `--no-timestamp` flag
+
 ## 1.0.1 (April 21, 2013)
 
 BUG FIXES:

data/README.md

@@ -1,5 +1,8 @@
 ## Omnibus
 
+[![Build Status](https://travis-ci.org/opscode/omnibus-ruby.png?branch=master)](https://travis-ci.org/opscode/omnibus-ruby)
+[![Code Climate](https://codeclimate.com/github/opscode/omnibus-ruby.png)](https://codeclimate.com/github/opscode/omnibus-ruby)
+
 Easily create full-stack installers for your project across a variety
 of platforms.
 

data/lib/omnibus/build_version.rb

@@ -269,13 +269,14 @@ module Omnibus
       version_regexp.match(git_describe)[1..3]
     end
 
-
     def append_timestamp?
-      append_timestamp = true
-      if ENV['OMNIBUS_APPEND_TIMESTAMP'] && (ENV['OMNIBUS_APPEND_TIMESTAMP'] =~ (/(false|f|no|n|0)$/i))
-        append_timestamp = false
+      if ENV['OMNIBUS_APPEND_TIMESTAMP'] && (ENV['OMNIBUS_APPEND_TIMESTAMP'] =~ (/^(false|f|no|n|0)$/i))
+        false
+      elsif ENV['OMNIBUS_APPEND_TIMESTAMP'] && (ENV['OMNIBUS_APPEND_TIMESTAMP'] =~ (/^(true|t|yes|y|1)$/i))
+        true
+      else
+        Omnibus::Config.append_timestamp
       end
-      append_timestamp
     end
   end
 end

data/lib/omnibus/cli/base.rb

@@ -45,6 +45,7 @@ module Omnibus
           # TODO: merge in all relevant CLI options here, as they should
           # override anything from a configuration file.
           Omnibus::Config.project_root(path)
+          Omnibus::Config.append_timestamp(@options[:timestamp]) if @options.key?('timestamp')
 
           unless Omnibus.project_files.any?
             raise Omnibus::CLI::Error, "Given path '#{path}' does not appear to be a valid Omnibus project root."

data/lib/omnibus/cli/build.rb

@@ -39,14 +39,10 @@ module Omnibus
         project = load_project!(project_name)
         project_task_name = "projects:#{project.name}"
 
-        say("Building #{project.name}", :green)
         unless options[:timestamp]
           say("I won't append a timestamp to the version identifier.", :yellow)
         end
-
-        # Until we have time to integrate the CLI deeply into the Omnibus codebase
-        # this will have to suffice! (sadpanda)
-        ENV['OMNIBUS_APPEND_TIMESTAMP'] = options[:timestamp].to_s
+        say("Building #{project.name} #{project.build_version}", :green)
 
         Rake::Task[project_task_name].invoke
       end

data/lib/omnibus/config.rb

@@ -159,6 +159,15 @@ module Omnibus
 
     # @!endgroup
 
+    # @!group Build Version Parameters
+
+    # @!attribute [rw] append_timestamp
+    #
+    #   @return [Boolean]
+    append_timestamp true
+
+    # # @!endgroup
+
     # @!group Validation Methods
 
     # Asserts that the Config object is in a valid state.  If invalid

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/build_version_spec.rb

@@ -156,36 +156,58 @@ describe Omnibus::BuildVersion do
       end
     end
 
-    describe "ENV['OMNIBUS_APPEND_TIMESTAMP'] usage" do
-
+    describe "appending a timestamp" do
       let(:git_describe){ "11.0.0-alpha-3-207-g694b062" }
 
-      it "appends a timestamp if not set" do
+      it "appends a timestamp by default" do
         build_version.semver.should =~ /11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/
       end
 
-      context "appends a timestamp if set to a truthy value" do
+      describe "ENV['OMNIBUS_APPEND_TIMESTAMP'] is set" do
         ["true","t","yes","y",1].each do |truthy|
-          let(:value) { truthy }
-          before { ENV['OMNIBUS_APPEND_TIMESTAMP'] = value.to_s }
+          context "to #{truthy}" do
+            before { ENV['OMNIBUS_APPEND_TIMESTAMP'] = truthy.to_s }
+            it "appends a timestamp" do
+              build_version.semver.should =~ /11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/
+            end
+          end
+        end
 
-          it "with #{truthy}" do
-            build_version.semver.should =~ /11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/
+        ["false","f","no","n",0].each do |falsey|
+          context "to #{falsey}" do
+            before { ENV['OMNIBUS_APPEND_TIMESTAMP'] = falsey.to_s }
+            it "does not append a timestamp" do
+              build_version.semver.should =~ /11.0.0-alpha.3\+git.207.694b062/
+            end
           end
         end
       end
 
-      context "does not append a timestamp if set to a falsey value" do
-        ["false","f","no","n",0].each do |falsey|
-          let(:value) { falsey }
-          before { ENV['OMNIBUS_APPEND_TIMESTAMP'] = value.to_s }
+      describe "Omnibus::Config.append_timestamp is set" do
+        context "is true" do
+          before { Omnibus::Config.append_timestamp(true) }
+          it "appends a timestamp" do
+            build_version.semver.should =~ /11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/
+          end
+        end
 
-          it "with #{falsey}" do
+        context "is false" do
+          before { Omnibus::Config.append_timestamp(false) }
+          it "does not append a timestamp" do
             build_version.semver.should =~ /11.0.0-alpha.3\+git.207.694b062/
           end
         end
       end
 
+      describe "both are set" do
+        before do
+          ENV['OMNIBUS_APPEND_TIMESTAMP'] = "false"
+          Omnibus::Config.append_timestamp(true)
+        end
+        it "prefers the value from ENV['OMNIBUS_APPEND_TIMESTAMP']" do
+          build_version.semver.should =~ /11.0.0-alpha.3\+git.207.694b062/
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -145,6 +145,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - .yardopts
 - CHANGELOG.md
 - Gemfile