winton-externals 0.1.4 → 0.1.5

data/bin/externals

@@ -3,12 +3,5 @@
 require 'rubygems'
 require 'externals'
 
-action = ARGV[0]
-available_actions = %w(status freeze unfreeze)
-unless available_actions.include?(action)
-  puts "Usage: externals (#{available_actions.join(':')})"
-  exit 1
-end
-
 app = Externals::App.new(FileUtils.pwd)
-app.run(action)
+app.run(ARGV[0])

data/externals.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = 'externals'
-  s.version = '0.1.4'
-  s.date    = '2008-03-11'
+  s.version = '0.1.5'
+  s.date    = '2008-03-12'
   
   s.summary     = "Work on git externals without affecting others"
   s.description = "Work on git externals without affecting others"

data/lib/externals/app.rb

@@ -8,22 +8,20 @@ module Externals
       config.each_repo {|r| r.status }
     end
 
-    def freezify
-      config.each_repo {|r| r.freezify }
+    def freeze
+      config.each_repo {|r| r.freeze }
     end
 
-    def unfreezify
-      config.each_repo {|r| r.unfreezify }
+    def unfreeze
+      config.each_repo {|r| r.unfreeze }
     end
 
     def run(action)
-      case action
-      when "status"
-        status
-      when "freeze"
-        freezify
-      when "unfreeze"
-        unfreezify
+      available_actions = %w(status freeze unfreeze)
+      if available_actions.include?(action)
+        send(action)
+      else
+        puts "Usage: externals (#{available_actions.join(':')})"
       end
     end
 
@@ -36,10 +34,9 @@ module Externals
 
       if config_file.nil?
         $stderr.puts "config/externals.yml is missing"
-        exit 1
+      else
+        @config = YamlConfig.new(@base_dir, File.read(config_file))
       end
-
-      @config = YamlConfig.new(@base_dir, File.read(config_file))
     end
   end
 end

data/lib/externals/repository.rb

@@ -11,71 +11,97 @@ module Externals
     end
     
     def install
-      FileUtils.mkdir_p checkout_path unless File.exist?(checkout_path)
-      `cd #{checkout_path} && rm -Rf #{@name} && git clone #{@repo_url} #{@name}`
-      puts "#{@name} unfrozen"
-      true
+      # Create directory that we will clone into
+      unless File.exist?(checkout_path)
+        FileUtils.mkdir_p(checkout_path)
+      end
+      Dir.chdir(checkout_path) do
+        # Remove repository if exists
+        FileUtils.rm_rf(@name)
+        # Clone repository
+        `git clone #{@repo_url} #{@name}`
+      end
     end
 
-    def freezify
-      install unless File.exist?(repo_path)
-      if frozen?
+    def freeze
+      install unless exists?
+      if is_not_a_git_repo?
         puts "#{@name} is already frozen"
-      elsif can_be_frozen?
+      elsif is_a_git_repo?
+        overwrite = true
+        # Conditionally destroy compressed repo
+        if is_compressed?
+          puts "You already have a frozen git snapshot. Overwrite?"
+          overwrite = STDIN.gets.downcase[0..0] == 'y'
+        end
         Dir.chdir(repo_path) do
-          `rm #{temp_path}/#{@name}.git.tgz` if can_be_unfrozen?
-          `mkdir -p #{temp_path}`
-          `tar czf #{temp_path}/#{@name}.git.tgz .git`
+          if overwrite
+            # Make temp directory
+            FileUtils.mkdir_p(temp_path)
+            # Compress .git folder to temp
+            `tar czf #{temp_path}/#{@name}.git.tgz .git`
+          end
+          # Remove repository's .git folder
           FileUtils.rm_r('.git')
         end
         puts "#{@name} frozen"
-      else
-        install
-        freezify
       end
-      true
     end
     
     def status
-      puts "#{@name} is #{can_be_frozen? ? "not frozen" : "frozen"}"
+      if exists?
+        puts "#{@name} is #{is_a_git_repo? ? "not frozen" : "frozen and #{is_compressed? ? "has" : "does not have"} a snapshot"}"
+      else
+        puts "#{@name} does not exist and #{is_compressed? ? "has" : "does not have"} a snapshot"
+      end
     end
 
-    def unfreezify
-      install unless File.exist?(repo_path)
-      if unfrozen?
+    def unfreeze
+      if is_a_git_repo?
         puts "#{@name} is already unfrozen"
-      elsif can_be_unfrozen?
-        Dir.chdir(temp_path) do
-          `tar xzf #{@name}.git.tgz`
-          FileUtils.mv(".git", repo_path)
-          FileUtils.rm("#{@name}.git.tgz")
-        end
-        Dir.chdir(repo_path) do
-          `git reset --hard`
+      elsif !exists?
+        install
+        puts "#{@name} unfrozen"
+      elsif is_not_a_git_repo?
+        if is_compressed?
+          Dir.chdir(temp_path) do
+            # Decompress git snapshot
+            `tar xzf #{@name}.git.tgz`
+            # Move back to repo
+            FileUtils.mv(".git", repo_path)
+            # Remove snapshot
+            FileUtils.rm_f("#{@name}.git.tgz")
+          end
+          # Reset repository to snapshot
+          Dir.chdir(repo_path) do
+            `git reset --hard`
+          end
+        else
+          # Clone fresh repo if no snapshot found
+          install
         end
         puts "#{@name} unfrozen"
-      else
-        install
       end
-      true
     end
     
-    def can_be_frozen?
+    def exists?
+      File.exist?(repo_path)
+    end
+    
+    def is_a_git_repo?
       File.exist?("#{repo_path}/.git")
     end
     
-    def can_be_unfrozen?
-      File.exists?("#{temp_path}/#{@name}.git.tgz")
+    def is_not_a_git_repo?
+      !is_a_git_repo?
     end
-
-    def frozen?
-      !File.exist?("#{repo_path}/.git") &&
+    
+    def is_compressed?
       File.exists?("#{temp_path}/#{@name}.git.tgz")
     end
     
-    def unfrozen?
-      File.exist?("#{repo_path}/.git") &&
-      !File.exists?("#{temp_path}/#{@name}.git.tgz")
+    def is_not_compressed?
+      !is_compressed?
     end
 
     private
@@ -86,10 +112,6 @@ module Externals
     def repo_path
       File.expand_path(checkout_path + '/' + @name)
     end
-
-    def rel_repo_path
-      @rel_path + '/' + @name
-    end
     
     def temp_path
       @base_dir + '/tmp'

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 
-Spec::Runner.configure do |config|
-
-end
+require 'rubygems'
+require 'externals'
+require 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-externals
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-11 00:00:00 -07:00
+date: 2008-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: []