depl 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4eff59033859fce127ee93cf953d43e210b340a
-  data.tar.gz: 9782ae13f49e5d3da1eb6a6c54f4db759fcb535e
+  metadata.gz: 15687a80e9ac8e4666c3ac6903173add2ba28096
+  data.tar.gz: bfe44d5ac3a5cd481166ff4baa7d5745fdb893da
 SHA512:
-  metadata.gz: 4e596864ffcc42fb63728175e2f1d1021ecbfc8c83934590d890fe7a11bc9334c9fd20903419225001dcb45af54d6a22c8e88cba6e959af481246811e40ff712
-  data.tar.gz: 51d1ff3eb63e8391b482ca787c97f5aa02ab8b42b7a92c061f15e11e9da0174a0b292e7ad498a077d98e9c78d5d19ed4fc90bea09cdefd6d8dcb3afb31d030ab
+  metadata.gz: 5997fee34089fab8c49049b9a5aad8907821e9539df276c42d45971cd68bccf54ee88d529a54631dfb1125e6f97223ca5fc3bbc8f13f4cf50151ad3b76894df5
+  data.tar.gz: 8e45fee13a66726ae29438e49c15a14712ffd5b4e11e990f728990d7fe37cc4a2b359b71452f75f800399cdbfe8ca153452843c28daad5628f632e604e10e2a6

data/bin/depl

@@ -69,7 +69,7 @@ end
 
 deploy = Depl::Main.new(options)
 
-if deploy.up_to_date
+if deploy.up_to_date?
   output "Everything up-to-date (#{deploy.environment.green}: #{deploy.remote_sha.green})"
   exit 0
 end

data/lib/depl/main.rb

@@ -23,12 +23,25 @@ module Depl
       @config[:prefix] || "deploy-"
     end
 
+    def origin
+      @config[:origin] || "origin"
+    end
+
     def deploy_branch
-      "#{prefix}#{environment}"
+      [prefix, environment].join('')
+    end
+
+    def tag_name
+      date = Time.now.strftime('%Y-%m-%d-%H-%M-%S')
+      [prefix, environment, '-', date].join('')
+    end
+
+    def tag_release
+      execute("git tag -a '#{tag_name}' #{local_sha}")
     end
 
-    def save_sha
-      execute("git push --force origin #{local_sha}:refs/heads/#{deploy_branch}")
+    def advance_branch_pointer
+      execute("git push --follow-tags --force #{origin} #{local_sha}:refs/heads/#{deploy_branch}")
     end
 
     def run!
@@ -36,7 +49,8 @@ module Depl
         `#{@config['before_hook']}`
       end
 
-      save_sha
+      tag_release
+      advance_branch_pointer
 
       if @config['after_hook']
         `#{@config['after_hook']}`
@@ -44,32 +58,32 @@ module Depl
     end
 
     def remote_sha
-      `git fetch origin`
-      sha = execute("git rev-parse -q --verify origin/#{deploy_branch}").chomp
-      sha if sha != ""
+      `git fetch #{origin}`
+      sha = execute("git rev-parse -q --verify #{origin}/#{deploy_branch}")
+      sha && sha.chomp || raise("missing remote sha for #{origin}/#{deploy_branch}")
     end
 
-    def up_to_date
+    def up_to_date?
       local_sha == remote_sha
     end
 
     def local_sha
       rev = @options[:rev] || @config[:branch] || 'head'
-      sha = execute("git rev-parse -q --verify #{rev}").chomp
-      sha if sha != ""
+      sha = execute("git rev-parse -q --verify #{rev}")
+      sha && sha.chomp || raise("missing local sha: #{rev}")
     end
 
     def diff
-      execute "git log --pretty=format:'    %h %<(20)%an %ar\t   %s' -10 #{remote_sha}..#{local_sha}"
+      execute "git log --pretty=format:'    %h %<(20)%an %ar\t   %s' #{remote_sha}..#{local_sha}"
     end
 
     def reverse_diff
-      execute "git log --pretty=format:'    %h %<(20)%an %ar\t   %s' -10 #{local_sha}..#{remote_sha}"
+      execute "git log --pretty=format:'    %h %<(20)%an %ar\t   %s' #{local_sha}..#{remote_sha}"
     end
 
     def older_local_sha
       return false unless remote_sha
-      execute("git merge-base --is-ancestor #{local_sha} #{remote_sha}") && $?.exitstatus == 0
+      !!execute("git merge-base --is-ancestor #{local_sha} #{remote_sha}")
     end
 
     def commit_count
@@ -79,7 +93,8 @@ module Depl
   protected
 
     def execute(cmd)
-      `#{cmd}`
+      output = `#{cmd}`
+      $?.exitstatus == 0 && output
     end
   end
 end

data/lib/depl/version.rb

@@ -1,3 +1,3 @@
 module Depl
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/depl/main_spec.rb

@@ -13,38 +13,40 @@ describe Depl::Main do
 
   describe '#diff' do
     it 'uses git to find the commits between two shas' do
-      deploy.should_receive(:remote_sha).and_return("remote")
-      deploy.should_receive(:local_sha).and_return("local")
+      expect(deploy).to receive(:remote_sha).and_return("remote")
+      expect(deploy).to receive(:local_sha).and_return("local")
 
-      cmd = "git log --pretty=format:'    %h %<(20)%an %ar\t   %s' -10 remote..local"
-      deploy.should_receive(:execute).with(cmd)
+      cmd = "git log --pretty=format:'    %h %<(20)%an %ar\t   %s' remote..local"
+      expect(deploy).to receive(:execute).with(cmd)
 
       deploy.diff
     end
   end
 
-  describe '#save_sha' do
+  describe '#advance_branch_pointer' do
     it 'pushes a sha to the origin' do
-      deploy.should_receive(:local_sha).and_return("12345")
+      expect(deploy).to receive(:local_sha).and_return("12345")
 
-      cmd = "git push --force origin 12345:refs/heads/deploy-production"
-      deploy.should_receive(:execute).with(cmd)
+      cmd = "git push --follow-tags --force origin 12345:refs/heads/deploy-production"
+      expect(deploy).to receive(:execute).with(cmd)
 
-      deploy.save_sha
+      deploy.advance_branch_pointer
     end
   end
 
   describe '#up_to_date' do
     it 'returns true when shas match' do
-      deploy.should_receive(:remote_sha).and_return("same")
-      deploy.should_receive(:local_sha).and_return("same")
-      expect(deploy.up_to_date).to be_true
+      expect(deploy).to receive(:remote_sha).and_return("same")
+      expect(deploy).to receive(:local_sha).and_return("same")
+
+      expect(deploy.up_to_date?).to be true
     end
 
     it 'returns true when shas differ' do
-      deploy.should_receive(:remote_sha).and_return("remote")
-      deploy.should_receive(:local_sha).and_return("local")
-      expect(deploy.up_to_date).to be_false
+      expect(deploy).to receive(:remote_sha).and_return("remote")
+      expect(deploy).to receive(:local_sha).and_return("local")
+
+      expect(deploy.up_to_date?).to be false
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Michael Nutt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Writes project deployment hash to s3 file