github_bitbucket_deployer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26db8331ec93b1bfcca69796b62706b44bde7df7
-  data.tar.gz: ab86f9d0b91833e8b4c23dc516ddab529b1f409c
+  metadata.gz: d6b737dfce5c4760aea2c32fe585d5abd944c3d0
+  data.tar.gz: 7094e876a2bbe279d65b7c0e08de58ec15f28cef
 SHA512:
-  metadata.gz: cd08ab565ec6cc99721f810869843ed9db8af8d9022d688fb3440f383d49913ad0467b5ca588e3352a959e2e39bf5a5993de7442ba611324d36f056adb91ac28
-  data.tar.gz: 2fec783ed7da9e3a094f3f71e8a9aa155156468477edbc69fe2a1dddec82ce4250fc459e47257ca07bc061e336c7b23147798976f6e7b5a84386c05e8907bf6b
+  metadata.gz: 60c62c6c1a2a8895a78dde75cdc21773d3cdcf83a268660066c738c269ada89c0132c85f2eb251e3dcede6a7c9f256a868e4f8fdb4a76ca2006e247de5a729a9
+  data.tar.gz: 73ca648da3ebbe5c09dd3d48d8ef555f2f0a8448c8ab3789c57a63f3c19acd0dbaa3f8dd83560eb8a1a4169d6648a46ae1f55feea02bfa1c1b03c0776afcbae4

data/lib/github_bitbucket_deployer/git.rb

@@ -5,7 +5,7 @@ require 'github_bitbucket_deployer/clone_logger_fix'
 
 module GithubBitbucketDeployer
   class Git
-    attr_reader :bitbucket_repo_url, :git_repo_name, :id_rsa, :repo_dir, :logger
+    attr_reader :bitbucket_repo_url, :git_repo_name, :id_rsa, :repo_dir, :logger, :force
 
     def initialize(options)
       @bitbucket_repo_url = options[:bitbucket_repo_url]
@@ -13,6 +13,7 @@ module GithubBitbucketDeployer
       @id_rsa = options[:id_rsa]
       @logger = options[:logger]
       @repo_dir = options[:repo_dir]
+      @force = options.fetch(:force, true)
     end
 
     def push_app_to_bitbucket(remote = 'bitbucket', branch = 'master')
@@ -49,7 +50,7 @@ module GithubBitbucketDeployer
     def push(remote, branch)
       logger.info("git push: deploying #{repo.dir} to " \
                   "#{repo.remote(remote).url} from branch #{branch}")
-      run { repo.push(remote, branch, force: true) }
+      run { repo.push(remote, branch, force: force) }
     end
 
     def add_remote(remote = 'bitbucket')

data/lib/github_bitbucket_deployer/version.rb

@@ -1,3 +1,3 @@
 module GithubBitbucketDeployer
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/lib/github_bitbucket_deployer/git_spec.rb

@@ -4,6 +4,7 @@ describe GithubBitbucketDeployer::Git do
   include GitHelpers
 
   let(:git) { described_class.new(options) }
+  let(:gentle_git) { described_class.new(gentle_options) }
 
   let(:options) do
     { bitbucket_repo_url: bitbucket_repo_url,
@@ -13,6 +14,8 @@ describe GithubBitbucketDeployer::Git do
       repo_dir: repo_dir }
   end
 
+  let(:gentle_options) { options.merge(force: false) }
+
   let(:bitbucket_repo_url) { 'git@bitbucket.org:g5dev/some_repo.git' }
   let(:git_repo_name) { 'some_repo' }
   let(:local_repo_folder) { Zlib.crc32(git_repo_name) }
@@ -71,6 +74,14 @@ describe GithubBitbucketDeployer::Git do
     it 'sets the repo_dir' do
       expect(git.repo_dir).to eq(repo_dir)
     end
+
+    it 'defaults to a forced push' do
+      expect(git.force).to be true
+    end
+
+    it 'can also be gentle' do
+      expect(gentle_git.force).to be false
+    end
   end
 
   describe '#push_app_to_bitbucket', :fakefs do
@@ -103,6 +114,12 @@ describe GithubBitbucketDeployer::Git do
             .with('bitbucket', 'master', force: true)
           push_app
         end
+
+        it 'can also be gentle' do
+          expect(git_repo).to receive(:push)
+            .with('bitbucket', 'master', force: false)
+          gentle_git.push_app_to_bitbucket
+        end
       end
 
       context 'when local repo does not exist' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_bitbucket_deployer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jessica Lynn Suttles
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Deploys public and private Github repos to bitbucket