merb-freezer 0.9.3 → 0.9.4

data/README

@@ -1,4 +1,35 @@
 merb-freezer
 ============
 
-see README.markdown
+<<<<<<< HEAD:merb-freezer/README
+This plugin lets you freeze Merb and run it using the frozen gems. 
+
+==Why would you want to freeze Merb?
+
+* You might have multiple applications on the same server/slice/cluster. Different applications might require different versions of Merb. 
+
+* You might work with a team of developers and want everyone to be using the same Merb version.
+
+* You are using Merb Edge, you want to make sure the production server and your co workers are developing/testing against the same revision.
+
+
+==What are your options?
+
+* You just want to lock your app to a specific version. For instance version merb-core 0.9.2
+
+* You only want to use frozen gems located in /framework or /gems
+
+
+== How to lock your app?
+
+TODO
+
+== How to use frozen gems
+
+Instead of starting merb by typing "merb" in your console, type "frozen-merb" and that's it :)
+
+
+If frozen-merb can't find frozen gems in /framework or /gems then Merb will start normally using the system's gems.
+=======
+see README.markdown
+>>>>>>> new_merb_gen:merb-freezer/README

data/Rakefile

@@ -1,29 +1,46 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
-PLUGIN = "merb-freezer"
-NAME = "merb-freezer"
-VERSION = "0.9.3"
-AUTHOR = "Matt Aimonetti"
-EMAIL = "mattaimonetti@gmail.com"
-HOMEPAGE = "http://www.merbivore.com"
-SUMMARY = "Merb plugin that let's you freeze Merb"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that let's you freeze Merb"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Matt Aimonetti"
+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
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', ">= #{GEM_VERSION}")
   s.require_path = 'lib'
   s.bindir = "bin"
   s.executables = %w( frozen-merb )
-  s.autorequire = PLUGIN
+  s.autorequire = 'merb-freezer'
+  s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
@@ -31,16 +48,23 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "install merb-freezer"
+desc "Install the gem"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
   end
-  
-end
+
+end
+
+
+desc "Run the freezer specs"
+Spec::Rake::SpecTask.new("specs") do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+ end

data/TODO

@@ -0,0 +1,5 @@
+TODO:
+Fix LICENSE with your name
+Fix Rakefile with your name and contact info
+Add your code to lib/merb-freezer.rb
+Add your Merb rake tasks to lib/merb-freezer/merbtasks.rb

data/bin/frozen-merb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-
 root = nil
 %w[-m --merb-root].detect { |o| root = ARGV.index(o) }
 __DIR__ = root ? ARGV[root+1] : Dir.getwd
+
 framework = File.join(__DIR__,"framework")
 
 # load merb from the framework folder
+
 if File.directory?(framework)
   puts "Running from frozen framework"
   core = File.join(framework,"merb-core")

data/lib/merb-freezer/freezer.rb

@@ -63,7 +63,6 @@ class Freezer
     
     # Calls the freezer mode on the component
     def freeze
-      puts "Ice, Ice Baby!"
       puts "freezing mode: #{@mode}"
       send "#{@mode}_freeze"
     end

data/lib/merb-freezer/freezer_mode.rb

@@ -1,15 +1,18 @@
 require 'find'
+require 'rubygems'
+require 'rubygems/dependency_installer'
+
 module FreezerMode
   
   def sudo
     windows = (PLATFORM =~ /win32|cygwin/) rescue nil
     sudo = windows ? "" : "sudo"
   end
-  
+
   def gitmodules
     File.join(Dir.pwd, ".gitmodules")
-  end    
-  
+  end
+
   # Uses the Git submodules to freeze a component
   #
   def submodules_freeze
@@ -34,35 +37,63 @@ module FreezerMode
     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.match(/.*\/(.*)\..{3}$/)[1]}`
       end
       if $?.success?
         `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")
+        $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)")
       end
     end
   end
-  
+
   # Uses rubygems to freeze the components locally
-  #
   def rubygems_freeze
     create_freezer_dir(freezer_dir)
-    action = update ? 'update' : 'install'
-    puts "#{action} #{@component} and dependencies from rubygems"
-    `#{sudo} gem #{action} #{@component} --no-rdoc --no-ri -i #{framework_component? ? 'framework' : 'gems'}`
+    puts "Install #{@component} and dependencies from rubygems"
+    if File.exist?(freezer_dir) && !File.writable?("#{freezer_dir}/cache")
+      puts "you might want to CHOWN the gems folder so it's not owned by root: sudo chown -R #{`whoami`} #{freezer_dir}"
+    end
+    install_rubygem @component
   end
   
+  # Install a gem - looks remotely and locally
+  # won't process rdoc or ri options.
+  def install_rubygem(gem, version = nil)
+    Gem.configuration.update_sources = false
+    Gem.clear_paths
+    installer = Gem::DependencyInstaller.new(:install_dir => freezer_dir)
+    exception = nil
+    begin
+      installer.install gem, version
+    rescue Gem::InstallError => e
+      exception = e
+    rescue Gem::GemNotFoundException => e
+      puts "Locating #{gem} in local gem path cache..."
+      spec = version ? Gem.cache.find_name(gem, "= #{version}").first : Gem.cache.find_name(gem).sort_by { |g| g.version }.last
+      if spec && File.exists?(gem_file = spec.installation_path / 'cache' / "#{spec.full_name}.gem")
+        installer.install gem_file
+      end
+      exception = e
+    end
+    if installer.installed_gems.empty? && e
+      puts "Failed to install gem '#{gem}' (#{e.message})"
+    end
+    installer.installed_gems.each do |spec|
+      puts "Successfully installed #{spec.full_name}"
+    end
+  end
+
   def create_freezer_dir(path)
     unless File.directory?(path)
       puts "Creating freezer directory ..."
       FileUtils.mkdir_p(path)
     end
   end
-  
+
   protected
 
   # returns true if submodules are used
@@ -76,10 +107,10 @@ module FreezerMode
   def managed?(component)
     File.directory?(File.join(freezer_dir, component)) || in_submodule?(component)
   end
-  
+
   def in_path?(bin)
     `which #{bin}`
     !$?.nil? && $?.success?
   end
-  
-end
+
+end

data/lib/merb-freezer/merbtasks.rb

@@ -18,4 +18,11 @@ namespace :freeze do
     Freezer.freeze(ENV["GEM"], ENV["UPDATE"], ENV["MODE"])
   end
   
-end
+  desc "freeze all merb components (core, more, plugins) - use MODE=rubgygems and UPDATE=true as in regular freezing tasks"
+  task :all do
+    ['core', 'more', 'plugins'].each do |component|
+      Freezer.freeze(component, ENV["UPDATE"], ENV["MODE"])
+    end
+  end
+  
+end

data/spec/merb-freezer_spec.rb

@@ -61,7 +61,7 @@ describe "merb-freezer" do
     mr_freeze.mode.should == 'rubygems'
     mr_freeze.freeze
     File.exists?('gems').should be_true
-    File.exists?('gems/gems/googlecharts-1.1.0').should be_true
+    Dir['gems/gems/googlecharts-1.*'].join(' ').include?('gems/gems/googlecharts-').should be_true
   end
   
 end

data/spec/spec_helper.rb

@@ -1,3 +1,3 @@
 $TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'merb-freezer'
+require 'merb-freezer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-freezer
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,10 +9,19 @@ autorequire: merb-freezer
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
+    version: 
 description: Merb plugin that let's you freeze Merb
 email: mattaimonetti@gmail.com
 executables: 
@@ -36,7 +45,7 @@ files:
 - spec/merb-freezer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://www.merbivore.com
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -56,8 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb plugin that let's you freeze Merb