jara 1.0.1-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c87b6cd554cf419c0b9f57631666fdb1b34158
-  data.tar.gz: b473ad12415da614856244fa5655a9485416e138
+  metadata.gz: 2866e6ec4f73dcf0b729a06c4c7cff6bd50dfaf8
+  data.tar.gz: 0b6922ae025849ac6d3ccbfc84cdaecb7062c3b6
 SHA512:
-  metadata.gz: 5e6a9457dca081a8b09728c715b2d3bed784109aad13c5556a1e9f4afc238fb4d32d752de91860e8779dd6be1094f4b5f8a5812064618538b9e857c292e8ccb3
-  data.tar.gz: 3ee40274d05ed21f2e4c527dab8b8df2c7ba5308157133045e89221ac4e7cfb6fdc93d0b77dfd00056bf4c3c81313032f38edf45cbb91359681c3afb532083bd
+  metadata.gz: 2831f0770b4f049855f2bf497bf74f271a4edb09ac19e593e80ab44332c01ac401ff2d7373a182d16d09d2b8686f4fbf0590cc39ee90408db2ed4f6803c1bb91
+  data.tar.gz: 550f1254bc23d82c133a0621c745f927356976ae754ec5b30b64ce5deb78e3e8061d434bb771cbd43b43b103a987828c9a6bb2826ee92533ef7374e08f1d9a3e

data/lib/jara/releaser.rb

@@ -16,6 +16,8 @@ module Jara
     def initialize(environment, bucket_name, options={})
       @environment = environment
       @bucket_name = bucket_name
+      @re_release = options.fetch(:re_release, false)
+      @extra_metadata = options[:metadata] || {}
       @shell = options[:shell] || Shell.new
       @archiver = options[:archiver] || Archiver.new
       @file_system = options[:file_system] || FileUtils
@@ -40,8 +42,8 @@ module Jara
         destination_dir = File.join(project_dir, 'build', @environment)
         jar_name = [app_name, @environment, date_stamp, branch_sha[0, 8]].join('-') << '.jar'
         Dir.mktmpdir do |path|
+          @shell.exec('git archive --format=tar --prefix=%s/ %s | (cd %s/ && tar xf -)' % [File.basename(path), branch_sha, File.dirname(path)])
           Dir.chdir(path) do
-            @shell.exec('git clone %s . && git checkout %s' % [project_dir, branch_sha])
             @logger.info('Checked out %s from branch %s' % [branch_sha[0, 8], @branch])
             @archiver.create(jar_name: jar_name)
             @file_system.mkdir_p(destination_dir)
@@ -56,7 +58,7 @@ module Jara
     def release
       raise JaraError, 'No environment set' unless @environment
       raise JaraError, 'No bucket name set' unless @bucket_name
-      if obj = find_remote_artifact
+      if !@re_release && (obj = find_remote_artifact)
         @logger.warn('An artifact for %s already exists: s3://%s/%s' % [branch_sha[0, 8], @bucket_name, obj.key])
       else
         local_path = find_local_artifact || build_artifact
@@ -103,11 +105,26 @@ module Jara
       end
     end
 
+    def git_remote
+      @git_remote ||= @shell.exec('git config --get remote.origin.url')
+    end
+
+    def jruby_version
+      @jruby_version ||= begin
+        jruby_jars_path = $LOAD_PATH.grep(/\/jruby-jars/).first
+        jruby_jars_path && jruby_jars_path.scan(/\/jruby-jars-(.+)\//).flatten.first
+      end
+    end
+
     def metadata
-      {
+      m = {
         'packaged_by' => "#{ENV['USER']}@#{Socket.gethostname}",
-        'sha' => branch_sha
+        'sha' => branch_sha,
+        'remote' => git_remote,
+        'jruby' => jruby_version,
       }
+      m.merge!(@extra_metadata)
+      m
     end
 
     def find_local_artifact

data/lib/jara/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jara
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: java
 authors:
 - Burt Platform Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement