soaring 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2553d9d3ceadf27c748db47a4f8d0f87cd2932fc
-  data.tar.gz: 60c92e246cc64e156d9b30760ad55973cac8a896
+  metadata.gz: 91f3db3f3699654ab86dfd0b4c525f2af47a6fff
+  data.tar.gz: c7f25974430839bcdf163a6377e19a8ad21a552c
 SHA512:
-  metadata.gz: 698c7400bb38cf1288c42f7d5a537c882d70dbd8ad79e6f730a0af676f585d638a3345fe482ce5afd0e093683a86b6493026936b25145127ce6c586c1bb5b01d
-  data.tar.gz: da121f079abfa2b9ee2c6a192a3b55213212dba9e1c3a5915c66fa2758c30067621fa130fe5d514fd7dae2c12c27566147871d70ce08fb3418a3f7521c63efe5
+  metadata.gz: 4c814065b0f343aeaf9ff8adea5fd768c5d87c380d48d5f6de7c3a85b163edda6d4f30f453830d77b9cdf31e4fe70c1d2ce5389cbc798d65bbb2f4d0b146b1c7
+  data.tar.gz: 1d528e82a2170f9c2bb092c0b05ac051d436e936e0254cfa4ab1c9bbaeab0edbc23a51dc74ea20687d9381365755d62652c1775a98a4d19dcaa5ebe8bde71bfb

data/lib/soaring/packager.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Soaring
   class Packager
     def initialize(options)
@@ -8,7 +10,7 @@ module Soaring
       Dir.chdir(@options[:project_root]) do
         validate_project if not @options[:ignore_git_checks]
         build_output_location = generate_build_output_location(@options[:project_root])
-        update_project_commit_hash
+        update_project_release_information
         `mkdir -p #{@options[:project_root]}/build`
         `zip -r #{build_output_location} * .ebextensions --exclude=build/* --exclude=config/environment.yml`
         puts "Build packaged at #{build_output_location}"
@@ -31,12 +33,26 @@ module Soaring
       "#{project_folder}/build/build_#{service_name}_#{get_short_commit_hash}_#{timestamp}.zip"
     end
 
-    def update_project_commit_hash
-      response, exit_status = Executor::execute("git rev-parse HEAD > commit-hash")
-      if not exit_status.success?
-        puts 'Failed to package, unable to get commit hash from local git repository'
+    def update_project_release_information
+      release_information = { 'commit_hash' => get_git_commit_hash,
+                              'commit_date' => get_git_commit_date }
+      File.open(".release_information", "w") do |file|
+        file.write release_information.to_yaml
+      end
+    end
+
+    def get_git_commit_hash
+      git_hash = `git rev-parse HEAD`.chomp
+      git_hash = /\A[0-9a-f]{5,40}\z/.match(git_hash)
+      if git_hash.nil?
+        $stderr.puts 'Failed to package, unable to get commit hash from local git repository'
         exit 1
       end
+      git_hash[0]
+    end
+
+    def get_git_commit_date
+      `git show -s --format=%cI`.chomp
     end
 
     def is_git_repo_up_to_date?

data/lib/soaring/version.rb

@@ -1,3 +1,3 @@
 module Soaring
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaring
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Barney de Villiers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler