merb-freezer 0.9.4 → 0.9.5

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "mattaimonetti@gmail.com"
 
 GEM_NAME    = "merb-freezer"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.4") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

data/bin/frozen-merb

@@ -27,13 +27,11 @@ if File.directory?(framework)
     end
   end
   require "merb-core/core_ext/kernel"
-  require "merb-core/core_ext/rubygems"
 else
   # load from the gems folder
   gem = Dir["./gems/gems/merb-core-*"].last
   if gem
     require gem + "/lib/merb-core/core_ext/kernel"
-    require gem + "/lib/merb-core/core_ext/rubygems"
   
     Gem.clear_paths
     Gem.path.unshift(__DIR__+"/gems")

data/lib/merb-freezer/freezer.rb

@@ -53,7 +53,7 @@ class Freezer
     def initialize(component, update=false, mode=nil)
       @component = Freezer.components.keys.include?(component) ? "merb-" + component : component
       @update    = update
-      if (mode.nil? && framework_component?) || component.match(/^git:\/\//) || mode == 'submodules'
+      if (mode.nil? && framework_component?) || component_git_url? || mode == 'submodules'
         @mode = 'submodules'
       else
         @mode = 'rubygems'
@@ -72,4 +72,19 @@ class Freezer
       Freezer.components.keys.include?(@component.gsub("merb-", ""))
     end
 
-end
+    def component_git_url?
+      return true if @component.split(":").first == "git"
+      return true if @component[-4..-1] == ".git"
+      false
+    end
+
+    def component_name
+      @component = File.basename(@component)
+      if @component[-4..-1] == ".git"
+        @component[0..-5]
+      else
+        @component
+      end
+    end
+
+end

data/lib/merb-freezer/freezer_mode.rb

@@ -5,8 +5,12 @@ require 'rubygems/dependency_installer'
 module FreezerMode
   
   def sudo
-    windows = (PLATFORM =~ /win32|cygwin/) rescue nil
-    sudo = windows ? "" : "sudo"
+    ENV['MERB_SUDO'] ||= "sudo"
+    sudo = windows? ? "" : ENV['MERB_SUDO']
+  end
+
+  def windows?
+    (PLATFORM =~ /win32|cygwin/) rescue nil
   end
 
   def gitmodules
@@ -17,7 +21,7 @@ module FreezerMode
   #
   def submodules_freeze
     # Ensure that required git commands are available
-    %w(git-pull git-submodule).each do |bin|
+    %w(git).each do |bin|
       next if in_path?(bin)
       $stderr.puts "ERROR: #{bin} must be avaible in PATH - you might want to freeze using MODE=rubygems"
       exit 1
@@ -27,22 +31,22 @@ module FreezerMode
     create_freezer_dir(freezer_dir)
 
     if managed?(@component)
-      puts "#{@component} seems to be already managed by git-submodule."
+      puts "#{@component} seems to be already managed by git submodule."
       if @update
         puts "Trying to update #{@component} ..."
-        `cd #{freezer_dir}/#{@component} && git-pull`
+        `cd #{freezer_dir}/#{@component} && git pull`
       else
         puts "you might want to call this rake task using UPDATE=true if you wish to update the frozen gems using this task"
       end
     else
       puts "Creating submodule for #{@component} ..."
       if framework_component?
-        `cd #{Dir.pwd} & git-submodule --quiet add #{Freezer.components[@component.gsub("merb-", '')]} #{File.basename(freezer_dir)}/#{@component}`
+        `cd #{Dir.pwd} & git submodule --quiet add #{Freezer.components[@component.gsub("merb-", '')]} #{File.basename(freezer_dir)}/#{@component}`
       else
-        `cd #{Dir.pwd} & git-submodule --quiet add #{@component} gems/submodules/#{@component.match(/.*\/(.*)\..{3}$/)[1]}`
+        `cd #{Dir.pwd} & git submodule --quiet add #{@component} gems/submodules/#{component_name}`
       end
       if $?.success?
-        `git-submodule init`
+        `git submodule init`
       else
         # Should this instead be a raise?
         $stderr.puts("ERROR: unable to create submodule for #{@component} - you might want to freeze using MODE=rubygems (make sure the current project has a git repository)")

data/spec/merb-freezer_spec.rb

@@ -63,5 +63,16 @@ describe "merb-freezer" do
     File.exists?('gems').should be_true
     Dir['gems/gems/googlecharts-1.*'].join(' ').include?('gems/gems/googlecharts-').should be_true
   end
-  
-end
+
+  it "should check if it's a git url correctly" do
+    Freezer.new('googlecharts.git').should be_component_git_url
+    Freezer.new('git://googlecharts').should be_component_git_url
+    Freezer.new('googlecharts').should_not be_component_git_url
+  end
+
+  it "should extract component name properly" do
+    Freezer.new('googlecharts.git').component_name.should == "googlecharts"
+    Freezer.new('git://moo/googlecharts').component_name.should == "googlecharts"
+    Freezer.new('~/moo/googlecharts').component_name.should == "googlecharts"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-freezer
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire: merb-freezer
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 +03:00
+date: 2008-08-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 description: Merb plugin that let's you freeze Merb
 email: mattaimonetti@gmail.com