not-quite-submodules 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/not-quite-submodules.rb

@@ -11,6 +11,7 @@ class NotQuiteSubmodules
     def initialize(repository, target_path, args = {})
       args[:target_path] = target_path
       @update_interval = args[:update_interval] || DEFAULT_UPDATE_INTERVAL
+      @force_update_to = args[:force_update_to]
 
       if args[:temp_path].nil?
         tmp_name = (Digest::SHA1.hexdigest repository)
@@ -24,29 +25,30 @@ class NotQuiteSubmodules
       end
 
       tags = get_repository_tags(args[:temp_path]).map { |x| Versionomy.parse(x) }.sort
-      if configuration_needs_update?(args[:temp_path], tags)
+      if configuration_needs_update?(args[:target_path], tags)
         update_target_path(args[:temp_path], args[:target_path], tags)
       end
     end
 
 private
 
-    def configuration_needs_update?(temp_path, tags)
-      return true if !ENV["FORCE_UPDATE"].nil?
-      current_tag = get_current_tag(temp_path)
+    def configuration_needs_update?(target_path, tags)
+      return true if !ENV["FORCE_UPDATE"].nil? || @force_update_to
+      current_tag = get_current_tag(target_path)
+      tell("Currently checked out tag is #{current_tag}, latest tag is #{tags.last}")
       return true if current_tag.nil?
       current_tag < tags.last
     end
 
     # Checks out the latest tag and copies all files to the target path.
     def update_target_path(temp_path, target_path, tags)
-      update_to = tags.last
+      update_to = @force_update_to || tags.last
       tell("About to update target path to tag '#{update_to}'")
 
       in_dir_do(temp_path) do
-        execute_command("git checkout #{update_to}")
+        execute_command("git reset --hard #{update_to}")
       end
-      set_current_tag(temp_path, update_to)
+      set_current_tag(target_path, update_to) if !@force_update_to
       tell("Updated to '#{update_to}'")
 
       tell("Copying updated files to '#{target_path}'")
@@ -62,6 +64,7 @@ private
       tell("Updating #{target_path}/.gitignore")
       files = in_dir_do(temp_path) { Dir.glob("*") }
       files.push(".gitignore")
+      files.push(".CURRENT_TAG")
       in_dir_do(target_path) do
         File.open(".gitignore", 'w+') { |f| f.write(files.join("\n")) }
       end
@@ -69,20 +72,20 @@ private
 
     # The file that contains the currently checked out tag (that is, the last tag
     # whose contents where copied to the configuration directory)
-    def tag_file(temp_path)
-      "#{temp_path}/.CURRENT_TAG"
+    def tag_file(target_path)
+      "#{target_path}/.CURRENT_TAG"
     end
 
-    def get_current_tag(temp_path)
-      dir = tag_file(temp_path)
+    def get_current_tag(target_path)
+      dir = tag_file(target_path)
       return nil if !File.exists?(dir)
       lines = File.read(dir).split("\n")
       return nil if lines.length < 1
       Versionomy.parse(lines.first)
     end
 
-    def set_current_tag(temp_path, tag)
-      File.open(tag_file(temp_path), 'w+') { |f| f.write(tag) }
+    def set_current_tag(target_path, tag)
+      File.open(tag_file(target_path), 'w+') { |f| f.write(tag) }
     end
 
     # Returns an array of tags specified for the cloned configuration repository
@@ -115,7 +118,9 @@ private
       in_dir_do(temp_path) do
         tell "Updating local configuration repository at '#{temp_path}'"
         execute_command("git checkout master")
-        execute_command("git pull origin master --tags")
+        execute_command("git fetch")
+        execute_command("git fetch --tags")
+        execute_command("git reset --hard origin/master")
 
         head = execute_command("git rev-parse HEAD")[0,8]
         tell("Updated local configuration repository to #{head}")

data/not-quite-submodules.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "not-quite-submodules"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lucas Jenss"]
-  s.date = "2013-04-05"
+  s.date = "2013-04-18"
   s.description = "This gem can be used to automatically clone an update a git repository, relying on tags to see if a newer version of the repository is available."
   s.email = "lucas@x3ro.de"
   s.extra_rdoc_files = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/x3ro/not-quite-submodules"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "This gem can be used to automatically clone and update a git repository."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: not-quite-submodules
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: versionomy
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2096812673318803401
+      hash: -4321208896240466877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This gem can be used to automatically clone and update a git repository.