sprout 0.7.205-x86-linux → 0.7.206-x86-linux

data/lib/sprout/tasks/git_task.rb

@@ -22,8 +22,6 @@ module Sprout
     # Path to a plain text file that contains a three-part version number.
     # @see VersionFile
     attr_accessor :version_file
-    # Accessor for mocking the git gem.
-    attr_accessor :scm
     # The remote branch to use, defaults to 'origin'.
     attr_accessor :remote
     # The local branch to send, defaults to 'master'.
@@ -66,6 +64,22 @@ module Sprout
       return t
     end
     
+    # Accessor for mocking the git gem.
+    def scm=(scm)
+      @scm = scm
+    end
+    
+    # Will open on path if no SCM exists yet.
+    def scm
+      if(@scm.nil?)
+        path = path_to_git
+        raise GitTaskError.new("We don't appear to be inside of a git repository") if path.nil?
+        @scm = Git.open(path)
+      end
+
+      @scm
+    end
+    
     private
     
     def push
@@ -92,23 +106,17 @@ module Sprout
     end
     
     def get_tags
-      return @scm.tags.collect do |t|
+      return scm.tags.collect do |t|
         t.name
       end
     end
     
     def create_tag(name)
-      @scm.add_tag name
+      scm.add_tag name
     end
     
     def validate
-      raise GitTaskError.new('version_file is a required configuration for GitTask') if version_file.nil?
-      if(@scm.nil?)
-        path = path_to_git
-        raise GitTaskError.new("We don't appear to be inside of a git repository") if path.nil?
-        @scm = Git.open(path)
-        @scm.pull
-      end
+      raise GitTaskError.new("task.version_file is a required configuration for GitTask") if version_file.nil?
     end
     
   end
@@ -118,4 +126,4 @@ end
 # Helper method for definining the git task in a rakefile
 def git(args, &block)
   Sprout::GitTask.define_task(args, &block)
-end
+end

data/lib/sprout/version.rb

@@ -1,10 +1,12 @@
 module Sprout
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 7
-    TINY  = 205
+  if(!defined? Sprout::VERSION)
+    module VERSION #:nodoc:
+      MAJOR = 0
+      MINOR = 7
+      TINY  = 206
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
-    MAJOR_MINOR = [MAJOR, MINOR].join('.')
+      STRING = [MAJOR, MINOR, TINY].join('.')
+      MAJOR_MINOR = [MAJOR, MINOR].join('.')
+    end
   end
 end

data/lib/sprout.rb

@@ -36,7 +36,9 @@ require 'sprout/general_tasks'
 require 'sprout/generator'
 
 module Sprout
-  SUDO_INSTALL_GEMS = 'false' == ENV['SUDO_INSTALL_GEMS'] ? false : true
+  if(!defined? SUDO_INSTALL_GEMS)
+    SUDO_INSTALL_GEMS = 'false' == ENV['SUDO_INSTALL_GEMS'] ? false : true
+  end
 
   class SproutError < StandardError #:nodoc:
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.205
+  version: 0.7.206
 platform: x86-linux
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency