gantree 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d4478af044e2d416b405280f08feef34c35ec6
-  data.tar.gz: 6c221680c7a3dcd83eb81e7d5bdfb1e1da9bb6f1
+  metadata.gz: fab5339982cb3099c8b0a393375b0700907f751a
+  data.tar.gz: d689ccf77086f35f6bea4cc3a7da1b69535029b8
 SHA512:
-  metadata.gz: 178085f479f97562426be69b98a9362dd063b6a9889ac7f733d25a030bb10b13132e9f5f578158cd3c7a39b87469c5f58ad31c05b3e252ddb3a612fa6d4947c0
-  data.tar.gz: a2dd894648cbe1670c55c74015880790da9040b24a9b5e194045ae03e0907b88ad34cac7cfe5ac1f674ea0486767ad08167c2413944511f0a9200d084eef9772
+  metadata.gz: 72ff98c01a21d02a83960a6dbc5d492f1c0b745fdacb3ecdc4c4339237151c1847657c43d44b020c2989d1cc7f57fa847953d50b9c109937dfcf58d15ff03580
+  data.tar.gz: e0ea01beb2ef7c3dbd302daf41e3253b54c25802a335afe0d55740fb2cbc5b94bd6160b4a96185ff3b417ce26086d8567cf78a85a4d2ca827f159e138df73fd0

data/lib/gantree/cli.rb

@@ -18,6 +18,7 @@ module Gantree
     option :autodetect_app_role, :desc => "use naming convention to determin role (true|false)", :type => :boolean, :default => true
     option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
     option :auth, :desc => "dockerhub authentation, example: bucket/key"
+    option :release_notes_staging, :type => :boolean, :default => false, :desc => "force release notes generation for staging deploys"
     def deploy name
       opts = merge_defaults(options)
       Gantree::Base.check_for_updates(opts)
@@ -100,6 +101,7 @@ module Gantree
     option :hush, :desc => "quite puts messages", :default => true
     option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
     option :auth, :desc => "dockerhub authentation, example: bucket/key"
+    option :release_notes_staging, :type => :boolean, :default => false, :desc => "force release notes generation for staging deploys"
     def ship server
       opts = merge_defaults(options)
       Gantree::Base.check_for_updates(opts)

data/lib/gantree/deploy.rb

@@ -64,7 +64,7 @@ module Gantree
       return if @options[:dry_run]
       version = DeployVersion.new(@options, envs[0])
       @packaged_version = version.run
-      puts @packaged_version
+      puts "packaged_version: #{@packaged_version}"
       upload_to_s3 
       create_eb_version
       update_application(envs)
@@ -79,8 +79,9 @@ module Gantree
         Librato::Metrics.annotate :deploys, "deploys",:source => "#{@app}", :start_time => Time.now.to_i
         puts "Librato metric submitted" 
       end
-      if @options[:release_notes_wiki] == "enabled" && prod_deploy? && @app.include?("-app-")
-        ReleaseNotes.new(@options[:release_notes_wiki], @app, new_hash).create
+      env = @envs.find {|e| e =~ /-app/ }
+      if env && @options[:release_notes_wiki] && (prod_deploy? || @options[:release_notes_staging])
+        ReleaseNotes.new(@options[:release_notes_wiki], env, @packaged_version).create
         `git tag #{tag}`
         `git push --tags`
       end
@@ -150,9 +151,6 @@ module Gantree
     def prod_deploy?
       @envs.first.split("-").first == "prod" 
     end 
-    def new_hash
-      @packaged_version.split("-")[2]
-    end
   end
 end
 

data/lib/gantree/deploy_version.rb

@@ -49,9 +49,13 @@ module Gantree
       image
     end
 
+    def version_tag
+      @options[:tag] || tag
+    end
+
     def create_version_files
       clean_up
-      version = "#{tag}-#{Time.now.strftime("%m-%d-%Y-%H-%M-%S")}"
+      version = "#{version_tag}-#{Time.now.strftime("%m-%d-%Y-%H-%M-%S")}"
       puts "version: #{version}"
       set_auth if @options[:auth]
       set_image_path if @options[:image_path]

data/lib/gantree/release_notes.rb

@@ -4,11 +4,15 @@ module Gantree
   class ReleaseNotes
     attr_reader :current_sha
     attr_writer :beanstalk
-    def initialize wiki, env_name, current_sha
+    def initialize(wiki, env_name, packaged_version)
       @env_name = env_name
       @wiki = wiki
       @org = wiki.split("/")[0..-2].join("/")
-      @current_sha = current_sha
+      @packaged_version = packaged_version
+    end
+
+    def current_sha
+      @packaged_version.split("-")[2]
     end
 
     def beanstalk
@@ -35,8 +39,8 @@ module Gantree
       name.include?("-") ? name.split("-")[1] : name # TODO: business logic
     end
 
-    def now
-      @now ||= Time.now.strftime("%a, %e %b %Y %H:%M:%S %z")
+    def pacific_time
+      Time.now.strftime '%Y-%m-%d %a %I:%M%p PDT'
     end
 
     def commits
@@ -58,8 +62,12 @@ module Gantree
       @commits = commits.uniq.sort
     end
 
+    def commits_list
+      commits.collect{|x| "* #{x}" }.join("\n")
+    end
+
     def git_log
-      execute("git log --no-merges --pretty=format:'%B COMMIT_SEPARATOR' #{@left}..#{@right}").strip
+      execute("git log --no-merges --pretty=format:'%B COMMIT_SEPARATOR' #{previous_sha}..#{current_sha}").strip
     end
 
     def execute(cmd)
@@ -69,9 +77,8 @@ module Gantree
     def notes
       compare = "#{previous_sha}...#{current_sha}"
       notes = <<-EOL
-"#{@env_name} #{now} [compare](#{@org}/#{app_name}/compare/#{compare})"
-
-#{commits.collect{|x| "* #{x}" }.join("\n")}
+#{@env_name} #{pacific_time} [#{compare}](#{@org}/#{app_name}/compare/#{compare}) by #{ENV['USER']} (#{@packaged_version})
+#{commits_list}
 EOL
     end
 

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/gantree/wiki.rb

@@ -35,7 +35,7 @@ module Gantree
       data = IO.read(@file_path) if File.exist?(@file_path)
       File.open(@file_path, "w") do |file|
         file.write(@notes)
-        file.write("\n\n")
+        file.write("\n")
         file.write(data) if data
       end
       true

data/spec/lib/gantree/1_release_notes_spec.rb

@@ -4,8 +4,8 @@ describe Gantree::ReleaseNotes do
   before(:all) do
     @wiki = "https://github.com/br/dev.wiki.git"
     @env_name = "stag-rails-app-s1"
-    @current_sha = "d961c96"
-    @rn = Gantree::ReleaseNotes.new(@wiki, @env_name, @current_sha)
+    @packaged_version = "br-master-d961c96-06-17-2015-23-33-25.zip"
+    @rn = Gantree::ReleaseNotes.new(@wiki, @env_name, @packaged_version)
     @rn.beanstalk = Aws::ElasticBeanstalk::Client.new(stub_responses: true)
   end
 
@@ -27,7 +27,7 @@ describe Gantree::ReleaseNotes do
   end
 
   it "can retrieve the current sha" do
-    expect(@rn.current_sha).to eq @current_sha
+    expect(@rn.current_sha).to eq "d961c96"
   end
 
   it "should generate notes" do
@@ -36,7 +36,7 @@ describe Gantree::ReleaseNotes do
     notes = @rn.notes
     puts notes if ENV['DEBUG']
     expect(notes).to include(@env_name)
-    expect(notes).to include(@rn.now)
+    expect(notes).to include(@rn.pacific_time)
     expect(notes).to include("compare")
     expect(notes).to include("test up controller")
   end

data/spec/lib/gantree/wiki_spec.rb

@@ -28,11 +28,11 @@ describe Gantree::Wiki do
     FileUtils.rm_f(@wiki.file_path)
     @wiki.add_to_top
     notes = IO.read(@wiki.file_path)
-    expect(notes).to eq "#{@notes}\n\n"
+    expect(notes).to eq "#{@notes}\n"
 
     @wiki.add_to_top
     notes = IO.read(@wiki.file_path)
-    expect(notes).to eq "#{@notes}\n\n#{@notes}\n\n"
+    expect(notes).to eq "#{@notes}\n#{@notes}\n"
   end
 
   it "should push" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Felix