0
@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
0
 
0
 PLUGIN = "merb-freezer"
0
 NAME = "merb-freezer"
0
-VERSION = "0.0.1"
0
+VERSION = "1.0.0"
0
 AUTHOR = "Matt Aimonetti"
0
 EMAIL = "mattaimonetti@gmail.com"
0
 HOMEPAGE = "http://www.merbivore.com"

0
@@ -1,6 +1,90 @@
0
-namespace :merb_freezer do
0
-  desc "Do something for merb-freezer"
0
-  task :default do
0
-    puts "merb-freezer doesn't do anything"
0
+class Freezer
0
+  
0
+  class << self
0
+
0
+    def components
0
+      {
0
+        "core" => "git://github.com/wycats/merb-core.git",
0
+        "more" => "git://github.com/wycats/merb-more.git",
0
+        "plugins" => "git://github.com/wycats/merb-plugins.git"
0
+      }
0
+    end
0
+
0
+    def framework_dir
0
+      # Should allow customization of this directory's location?
0
+      File.join(File.dirname(__FILE__), "framework")
0
+    end
0
+
0
+    def gitmodules
0
+      File.join(File.dirname(__FILE__), ".gitmodules")    
0
+    end
0
+
0
+    def freeze(component, update = false)
0
+      new(component, update).freeze
0
+    end
0
+
0
+  end
0
+
0
+  def initialize(component, update)
0
+    @component = "merb-" + component
0
+    @update    = update
0
+  end
0
+  
0
+  def freeze
0
+    # Ensure that required git commands are available
0
+    %w(git-pull git-submodule).each do |bin|
0
+      next if in_path?(bin)
0
+      $stderr.puts "ERROR: #{bin} must be avaible in PATH"
0
+      exit 1
0
+    end
0
+
0
+    unless File.directory?(framework_dir)
0
+      puts "Creating framework directory ..."
0
+      FileUtils.mkdir_p(framework_dir)
0
+    end
0
+
0
+    if managed?
0
+      puts "#{@component} seems to be already managed by git-submodule."
0
+      if @update
0
+        puts "Trying to update #{@component} ..."
0
+        sh "cd #{framework_dir}/#{@component} && git-pull"
0
+      end
0
+    else
0
+      puts "Creating submodule for #{@component} ..."
0
+      sh "git-submodule --quiet add #{components[@component.gsub("merb-", '')]} #{File.basename(framework_dir)}/#{@component}" 
0
+      if $?.success?
0
+        sh("git-submodule init")
0
+      else
0
+        # Should this instead be a raise?
0
+        $stderr.puts("ERROR: unable to create submodule for #{@component}")
0
+      end
0
+    end
0
+  end
0
+
0
+  protected
0
+
0
+  def in_submodule?
0
+    return false unless File.exists?(gitmodules)
0
+    File.read(gitmodules) =~ %r![submodule "#{framework_dir}/#{@component}"]!
0
+  end
0
+
0
+  def managed?
0
+    File.directory?(File.join(framework_dir, @component)) || in_submodule?
0
+  end
0
+
0
+  def in_path?(bin)
0
+    `which #{bin}`
0
+    !$?.nil? && $?.success?
0
+  end
0
+
0
+end
0
+
0
+task :freeze => Freezer.components.keys.map { |component| "freeze:#{component}" }
0
+namespace :freeze do
0
+  Freezer.components.each do |component, git_repository|
0
+    desc "Freeze #{component} from #{git_repository}"
0
+    task component do
0
+      Freezer.freeze(component, ENV["UPDATE"])
0
+    end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -32,95 +32,3 @@ desc "Add new files to subversion"
0
 task :svn_add do
0
    system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
0
 end
0
-
0
-
0
-class Freezer
0
-  
0
-  class << self
0
-
0
-    def components
0
-      {
0
-        "core" => "git://github.com/wycats/merb-core.git",
0
-        "more" => "git://github.com/wycats/merb-more.git",
0
-        "plugins" => "git://github.com/wycats/merb-plugins.git"
0
-      }
0
-    end
0
-
0
-    def framework_dir
0
-      # Should allow customization of this directory's location?
0
-      File.join(File.dirname(__FILE__), "framework")
0
-    end
0
-
0
-    def gitmodules
0
-      File.join(File.dirname(__FILE__), ".gitmodules")    
0
-    end
0
-
0
-    def freeze(component, update = false)
0
-      new(component, update).freeze
0
-    end
0
-
0
-  end
0
-
0
-  def initialize(component, update)
0
-    @component = "merb-" + component
0
-    @update    = update
0
-  end
0
-  
0
-  def freeze
0
-    # Ensure that required git commands are available
0
-    %w(git-pull git-submodule).each do |bin|
0
-      next if in_path?(bin)
0
-      $stderr.puts "ERROR: #{bin} must be avaible in PATH"
0
-      exit 1
0
-    end
0
-
0
-    unless File.directory?(framework_dir)
0
-      puts "Creating framework directory ..."
0
-      FileUtils.mkdir_p(framework_dir)
0
-    end
0
-
0
-    if managed?
0
-      puts "#{@component} seems to be already managed by git-submodule."
0
-      if @update
0
-        puts "Trying to update #{@component} ..."
0
-        sh "cd #{framework_dir}/#{@component} && git-pull"
0
-      end
0
-    else
0
-      puts "Creating submodule for #{@component} ..."
0
-      sh "git-submodule --quiet add #{components[@component.gsub("merb-", '')]} #{File.basename(framework_dir)}/#{@component}" 
0
-      if $?.success?
0
-        sh("git-submodule init")
0
-      else
0
-        # Should this instead be a raise?
0
-        $stderr.puts("ERROR: unable to create submodule for #{@component}")
0
-      end
0
-    end
0
-  end
0
-
0
-  protected
0
-
0
-  def in_submodule?
0
-    return false unless File.exists?(gitmodules)
0
-    File.read(gitmodules) =~ %r![submodule "#{framework_dir}/#{@component}"]!
0
-  end
0
-
0
-  def managed?
0
-    File.directory?(File.join(framework_dir, @component)) || in_submodule?
0
-  end
0
-
0
-  def in_path?(bin)
0
-    `which #{bin}`
0
-    !$?.nil? && $?.success?
0
-  end
0
-
0
-end
0
-
0
-task :freeze => Freezer.components.keys.map { |component| "freeze:#{component}" }
0
-namespace :freeze do
0
-  Freezer.components.each do |component, git_repository|
0
-    desc "Freeze #{component} from #{git_repository}"
0
-    task component do
0
-      Freezer.freeze(component, ENV["UPDATE"])
0
-    end
0
-  end
0
-end