jara 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce788b9e5d1533e6c4e79b70ec143fdbeec85f7e
-  data.tar.gz: d718a9cbc873b371ed2ba12d9b1f6c3fe0f3debd
+  metadata.gz: 9b49ca235ee38f2f65e1efd145cc2ea4e8804648
+  data.tar.gz: 42cb51242bafcd030fd4888342d34a37be9691e5
 SHA512:
-  metadata.gz: 92c63984645cf24220f20ba95e009e284074ab4d2831e45d0916bbc3327607429b55a07f5792cf614d1ad89e215bfd4509fb8c4adfe4a56187495183f2f2a0a8
-  data.tar.gz: c266fc7c5efdbf9a3de77cd180e60ff824acd31713b4d2287369b5eb2ba691a6250686b117bc33ae70e47341935a661cc94171c6096a2fc4f1b0c2c30993b4d8
+  metadata.gz: b0f61de31ccaf042bd8c44f5c1d357db4cada20efb4f5ea700266c471f063d978380d3f4260192a49b09ce145c094948a24aedf796c2959cd741a2f4f84d9e39
+  data.tar.gz: 1709a98b70e2909eba1489bb521ea9f37a60e1730dbee523ec8a67c161693ad2b64e68b0270eb90fb81748b48cd582c655ecc6cf079a0b24ad00c55ea5f2acce

data/lib/jara/cli.rb

@@ -15,6 +15,7 @@ module Jara
       options = {}
       options[:archiver] = @archiver if @archiver
       options[:build_command] = @build_command if @build_command
+      options[:branch] = @branch if @branch
       releaser = Jara::Releaser.new(@environment, @bucket, options)
       case @command
       when /help|-h/
@@ -44,6 +45,7 @@ module Jara
         parser.separator 'Common options:'
         parser.on('-e', '--environment=ENV', 'Environment to release to (e.g. production, staging)') { |e| @environment = e }
         parser.on('-a', '--archiver=TYPE', 'Archiver to use (jar or tgz)') { |t| @archiver = t.to_sym }
+        parser.on('--branch=BRANCH', 'Branch to release from, if not same as environment (production must be released from master)') { |b| @branch = b }
         parser.on('-c', '--build-command=COMMAND', 'Command to run before creating the artifact') { |c| @build_command = c }
         parser.on('-h', '--help', 'Show this message') { @command = 'help' }
         parser.separator ''

data/lib/jara/releaser.rb

@@ -25,7 +25,14 @@ module Jara
       @file_system = options[:file_system] || FileUtils
       @s3 = options[:s3]
       @logger = options[:logger] || IoLogger.new($stderr)
-      @branch = @environment == 'production' ? 'master' : @environment
+      if @environment == 'production'
+        if options[:branch]
+          raise JaraError, 'Production must be released from master'
+        end
+        @branch = 'master'
+      else
+        @branch = options[:branch] || @environment
+      end
     end
 
     def build_artifact

data/lib/jara/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Jara
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jara
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Burt Platform Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: aws-sdk-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: aws-sdk-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 description: |-
   Jara is a tool for building artifacts from a Git
                          repository, and can make standalone Jar files for JRuby.
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Builds and publishes project artifacts