grancher 0.1 → 0.1.1

data/CHANGELOG

@@ -1 +1,2 @@
+v0.1.1 Allows full git refspec to push to (in place of g.branch). Other minor fixes.
 v0.1. First version.

data/grancher.gemspec

@@ -2,36 +2,32 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grancher}
-  s.version = "0.1"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus Holm"]
-  s.date = %q{2008-12-20}
+  s.date = %q{2010-04-06}
   s.description = %q{Easily copy folders and files to other Git branches}
   s.email = %q{judofyr@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/grancher/task.rb", "lib/grancher.rb"]
   s.files = ["CHANGELOG", "LICENSE", "README", "lib/grancher/task.rb", "lib/grancher.rb", "Rakefile", "Manifest", "grancher.gemspec"]
-  s.has_rdoc = true
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Grancher", "--main", "README", "--main", "Grancher", "--title", "Grancher"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{dojo}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Easily copy folders and files to other Git branches}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<gash>, [">= 0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<gash>, [">= 0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<gash>, [">= 0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/grancher.rb

@@ -9,8 +9,8 @@ require 'gash'
 #
 #   require 'grancher'
 #   grancher = Grancher.new do |g|
-#     g.branch = 'gh-pages'
-#     g.push_to = 'origin' 
+#     g.branch = 'gh-pages'         # alternatively, g.refspec = 'ghpages:/refs/heads/ghpages'
+#     g.push_to = 'origin'
 #     g.repo = 'some_repo'          # defaults to '.'
 #     g.message = 'Updated website' # defaults to 'Updated files.'
 #   
@@ -66,7 +66,7 @@ require 'gash'
 # 
 #
 class Grancher
-  attr_accessor :branch, :push_to, :repo, :message
+  attr_accessor :branch, :refspec, :push_to, :repo, :message
   attr_reader :gash, :files, :directories
   
   def initialize(&blk)
@@ -75,11 +75,12 @@ class Grancher
     @keep = []
     @repo = '.'
     @message = 'Updated files.'
-    
-    if blk.arity == 1
-      blk.call(self)
-    else
-      self.instance_eval(&blk)
+    if block_given?
+      if blk.arity == 1
+        blk.call(self)
+      else
+        self.instance_eval(&blk)
+      end
     end
   end
   
@@ -100,17 +101,33 @@ class Grancher
   
   # Keeps the files (or directories) given.
   def keep(*files)
-    @keep.concat(files)
+    @keep.concat(files.flatten)
   end
   
   # Keep all the files in the branch.
   def keep_all
     @keep_all = true
   end
-  
+
+  # Full git refspec to push to. Setting g.refspec will replace g.branch. Used when the remote
+  # branch is different to the local branch. Any git refspec is valid ('man git-push' for details)
+  def refspec=(refspec)
+    if refspec =~ /^\+?(.*)(?:\:.*)$/
+      @branch = $1
+    else
+      raise ArgumentError, "refspec syntax error. Should be: branch:refs/heads/branch"
+    end
+    @refspec = refspec
+  end
+
+  def branch=(branch)
+    @refspec = "#{branch}:refs/heads/#{branch}"
+    @branch = branch
+  end
+
   # Pushes the branch to the remote.
   def push
-    gash.send(:git, 'push', @push_to, @branch + ':refs/heads/' + @branch)
+    gash.send(:git, 'push', @push_to, @refspec)
   end
   
   # Commits the changes.

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: grancher
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Magnus Holm
@@ -9,29 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-20 00:00:00 +01:00
+date: 2010-04-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gash
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Easily copy folders and files to other Git branches
 email: judofyr@gmail.com
 executables: []
@@ -55,6 +52,8 @@ files:
 - grancher.gemspec
 has_rdoc: true
 homepage: ""
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -73,20 +72,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: dojo
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Easily copy folders and files to other Git branches
 test_files: []