repomen 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6865efd46b5cf841cd5f99cdeadb0889bea0fd
-  data.tar.gz: 31abc290a77820980ad0ca1c4ae974930919cebb
+  metadata.gz: d9a2002e0a9f81fb1cd5d3d0ea78fded26317280
+  data.tar.gz: 26eb1d304aa888a7a51b5324fb641b4b61071a81
 SHA512:
-  metadata.gz: 2fe58a0f5771ceb6078557b0826e7086aa292dcd28d9094d8cd6bd722c456892c1d108d337b836d25fa91cbd8100f668a56e54a16e0412b9768cb9cf2a1d1614
-  data.tar.gz: c19d5e253d1378678f35e6f7feed8fa2d1310c24b09d29d83ccc1f012f852c57f294e882d890d9fd1077ce68561261de9ed848586b06f9c4d45d24a07d1e214e
+  metadata.gz: f9d26bf5a96cee4c669721aa83eea98737cee817d63f7a7e7f3545ad5bd556f9eab9130299ae64c8cfc5e33413c6933f1e7955e82573f83ea185c4fb5cd9752d
+  data.tar.gz: b4c1b3c8784b13fa78781d6bb60cd9ba8934004d578acc55a3a0d28576866eb4f2107e05bc7d6b99d7d27fa3c34d282e6f31f6dd55334501009b5f1c699b5bd7

data/lib/repomen/repo/handler/base.rb

@@ -29,6 +29,10 @@ module Repomen
         def revision
           raise NotImplementedError
         end
+
+        def tag
+          raise NotImplementedError
+        end
       end
     end
   end

data/lib/repomen/repo/handler/git.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 
 module Repomen
+  HandlerError = Class.new(RuntimeError)
+
   module Repo
     module Handler
       # Handler for git repositories
@@ -11,16 +13,21 @@ module Repomen
         def branch_name
           branch = nil
           in_dir do
-            branch = git 'rev-parse', '--abbrev-ref', 'HEAD'
+            branch = git(:'rev-parse', '--abbrev-ref', 'HEAD')
           end
-          branch.strip
+          branch
         end
 
-        def change_branch(name)
+        def change_branch(name, update_branch = false)
           in_dir do
-            git :checkout, name, '--quiet'
+            output = git(:checkout, name, '--quiet')
+            unless $?.success?
+              raise HandlerError.new("checkout failed: #{name.inspect}")
+            end
+            pull if update_branch
           end
         end
+        alias :checkout_revision :change_branch
 
         # Removes the repo from the filesystem
         # @return [void]
@@ -30,11 +37,13 @@ module Repomen
 
         # Retrieves the repo from +@url+
         # @return [void]
-        def retrieve
+        def retrieve(branch_name = "master")
           if repo_exists?
+            change_branch(branch_name)
             update_repo
           else
             clone_repo
+            change_branch(branch_name) if $?.success?
           end
           $?.success?
         end
@@ -42,15 +51,23 @@ module Repomen
         def revision
           rev = nil
           in_dir do
-            rev = git 'rev-parse', 'HEAD'
+            rev = git(:'rev-parse', 'HEAD')
+          end
+          rev
+        end
+
+        def tag
+          output = nil
+          in_dir do
+            output = git(:describe, '--exact-match', 'HEAD')
           end
-          rev.strip
+          output
         end
 
         private
 
         def git(*args)
-          `git #{args.join(' ')}`
+          `git #{args.join(' ')}`.chomp
         end
 
         def in_dir(dir = @path, &block)

data/lib/repomen/retriever.rb

@@ -36,9 +36,13 @@ module Repomen
 
     # Changes the branch of the retrieved repo.
     # @param name [String] name of the branch
-    def change_branch(name)
-      @handler.change_branch(name)
+    def change_branch(name, update_branch = false)
+      @handler.change_branch(name, update_branch)
+      true
+    rescue Repomen::HandlerError
+      false
     end
+    alias :checkout_revision :change_branch
 
     # Removes the repo from the filesystem
     def discard_repo
@@ -55,6 +59,11 @@ module Repomen
       @handler.revision
     end
 
+    # Returns the tag of the repo.
+    def tag
+      @handler.tag
+    end
+
     def repo_name
       @service.repo_name
     end
@@ -76,4 +85,4 @@ module Repomen
       File.join(*parts)
     end
   end
-end
+end

data/lib/repomen/version.rb

@@ -1,3 +1,3 @@
 module Repomen
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repomen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - René Föhring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler