dandelion 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5520acb69585608fbf7087b4bb2ca2d37a7ba767
-  data.tar.gz: bcfa8fae2c7324ee5dfebf64d54f6f3aa38b1504
+  metadata.gz: 2e24ed3bb3d909f2dde31c896dc0a55ba7bea103
+  data.tar.gz: 40301d574cfbd917d0ccc85da4449ff79f73226e
 SHA512:
-  metadata.gz: 0b0b3e1773552af905d074664285fc30f271d2c1dfbceb8fea159bc753cedeb124c0b2462bbc3bbb077c6d600ffc1f2d72acb3df5e0ae313149f710cc2af5b4a
-  data.tar.gz: 2f9e4b05a622d0a1a61bbdc99a7d23785d3e755b54f751364dedf896476ba0a377cbe073b794096ecf0bbe232321f004c1771a4aa719127a08d60ae48bb5e718
+  metadata.gz: a33bd1ff022f1c5f0c0497d52e04b545db4f38b9f69487bd7ebe6d83753e2f3189b057d1b03a670a9057f5b8d9494c2a3e62b7a84b26a0b0fe7d55980ce3fc04
+  data.tar.gz: 963b92769bd3ab6c1af4af22662f056776ce801472c9542d726e3e5adb9f3aefecde44700a3744fbc6148c3e517b9c3bf079cc359f03364ffc37c435de2ec2bc

data/lib/dandelion/adapter/s3.rb

@@ -21,7 +21,11 @@ module Dandelion
         connect!
 
         key = path(file)
-        policy = AWS::S3::S3Object.acl(key, bucket_name) if @config[:preserve_permissions]
+        
+        begin
+          policy = AWS::S3::S3Object.acl(key, bucket_name) if @config[:preserve_permissions]
+        rescue AWS::S3::NoSuchKey
+        end
 
         AWS::S3::S3Object.store(path(file), data, bucket_name)
         AWS::S3::S3Object.acl(key, bucket_name, policy) unless policy.nil?

data/lib/dandelion/cli.rb

@@ -4,10 +4,11 @@ module Dandelion
   class CLI
     def initialize(args)
       @args = args
+      
       @options = {}
-      @parser = Command::Base.parser(@options)
-
       @options[:help] = true if @args.length == 0
+
+      @parser = Command::Base.parser(@options)
     end
 
     def config

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/lib/dandelion/workspace.rb

@@ -41,18 +41,28 @@ module Dandelion
   private
 
     def lookup(val)
-      begin
-        begin
-          if ref = @repo.ref(val)
-            val = ref.target.to_s
-          end
-        rescue Rugged::ReferenceError
-        end
-
-        @repo.lookup(val)
-      rescue Rugged::OdbError, Rugged::InvalidError
-        raise RevisionError.new(val)
-      end
+      result = lookup_sha(val) ||
+        lookup_ref(val) ||
+        lookup_ref("refs/tags/#{val}") ||
+        lookup_ref("refs/branches/#{val}") ||
+        lookup_ref("refs/heads/#{val}")
+
+      raise RevisionError.new(val) unless result
+
+      result
+    end
+
+    def lookup_sha(val)
+      @repo.lookup(val)
+    rescue Rugged::OdbError, Rugged::InvalidError
+      nil
+    end
+
+    def lookup_ref(val)
+      ref = @repo.ref(val)
+      lookup_sha(ref.target) if ref
+    rescue Rugged::ReferenceError
+      nil
     end
 
     def local_sha

data/spec/dandelion/workspace_spec.rb

@@ -19,10 +19,28 @@ describe Dandelion::Workspace do
     end
 
     context 'valid revision specified' do
-      let(:workspace) { Dandelion::Workspace.new(test_repo, adapter, revision: initial_revision) }
+      context 'sha' do
+        let(:workspace) { Dandelion::Workspace.new(test_repo, adapter, revision: initial_revision) }
 
-      it 'returns commit for given revision' do
-        expect(workspace.local_commit.oid).to eq initial_revision
+        it 'returns commit for given revision' do
+          expect(workspace.local_commit.oid).to eq initial_revision
+        end
+      end
+
+      context 'tag' do
+        let(:workspace) { Dandelion::Workspace.new(test_repo, adapter, revision: 'test-tag') }
+
+        it 'returns commit for given revision' do
+          expect(workspace.local_commit.oid).to eq initial_revision
+        end
+      end
+
+      context 'branch' do
+        let(:workspace) { Dandelion::Workspace.new(test_repo, adapter, revision: 'master') }
+
+        it 'returns commit for given revision' do
+          expect(workspace.local_commit.oid).to eq head_revision
+        end
       end
     end
 

data/spec/fixtures/repo.git/refs/tags/test-tag

@@ -0,0 +1 @@
+e289ff1e2729839759dbd6fe99b6e35880910c7c

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Scott Nelson
@@ -101,6 +101,7 @@ files:
 - spec/fixtures/repo.git/objects/ee/314a31b622b027c10981acaed7903a3607dbd4
 - spec/fixtures/repo.git/objects/f6/66b137794d56880bab05e8fd256713a8fccf92
 - spec/fixtures/repo.git/refs/heads/master
+- spec/fixtures/repo.git/refs/tags/test-tag
 - spec/fixtures/repo_symlink.git/HEAD
 - spec/fixtures/repo_symlink.git/config
 - spec/fixtures/repo_symlink.git/description
@@ -206,6 +207,7 @@ test_files:
 - spec/fixtures/repo.git/objects/ee/314a31b622b027c10981acaed7903a3607dbd4
 - spec/fixtures/repo.git/objects/f6/66b137794d56880bab05e8fd256713a8fccf92
 - spec/fixtures/repo.git/refs/heads/master
+- spec/fixtures/repo.git/refs/tags/test-tag
 - spec/fixtures/repo_symlink.git/HEAD
 - spec/fixtures/repo_symlink.git/config
 - spec/fixtures/repo_symlink.git/description