sashimi 0.1.7 → 0.2.0

data/lib/sashimi/repositories/git_repository.rb

@@ -1,16 +1,21 @@
 module Sashimi
   class GitRepository < AbstractRepository
+    # Install the +plugin+.
     def install
       prepare_installation
       puts plugin.guess_name.titleize + "\n\n"
-      Kernel.system("git clone #{plugin.url}")
-      add_to_cache(plugin.to_hash)
+      with_path local_repository_path do
+        Kernel.system("git clone #{plugin.url}")
+        add_to_cache(plugin.to_hash)
+      end
     end
     
+    # Update the +plugin+.
     def update
       puts plugin.name.titleize + "\n\n"
-      change_dir_to_plugin_path
-      Kernel.system('git pull')
+      with_path plugin_path do
+        Kernel.system('git pull')
+      end
     end
   end
 end

data/lib/sashimi/repositories/svn_repository.rb

@@ -1,16 +1,21 @@
 module Sashimi
   class SvnRepository < AbstractRepository
+    # Install the +plugin+.
     def install
       prepare_installation
       puts plugin.guess_name.titleize + "\n\n"
-      Kernel.system("svn co #{plugin.url} #{plugin.guess_name}")
-      add_to_cache(plugin.to_hash)
+      with_path local_repository_path do
+        Kernel.system("svn co #{plugin.url} #{plugin.guess_name}")
+        add_to_cache(plugin.to_hash)
+      end
     end
     
+    # Update the +plugin+.
     def update
       puts plugin.name.titleize + "\n\n"
-      change_dir_to_plugin_path
-      Kernel.system("svn up")
+      with_path plugin_path do
+        Kernel.system("svn up")
+      end
     end
   end
 end

data/lib/sashimi/version.rb

@@ -1,8 +1,8 @@
 module Sashimi #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 7
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/sashimi.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2008 Luca Guidi
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 

data/sashimi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name               = "sashimi"
-  s.version            = "0.1.7"
-  s.date               = "2008-06-23"
+  s.version            = "0.2.0"
+  s.date               = "2008-07-14"
   s.summary            = "Rails plugins manager"
   s.author             = "Luca Guidi"
   s.email              = "guidi.luca@gmail.com"

data/test/test_helper.rb

@@ -4,74 +4,156 @@ require 'sashimi'
 class Test::Unit::TestCase
   include Sashimi
   
+  # Asserts the given condition is false.
   def assert_not(condition, message = nil)
     assert !condition, message
   end
   
+  # Asserts the given collection is empty.
+  def assert_empty(collection, message = nil)
+    assert collection.empty?, message
+  end
+  
+  # Asserts the given collection is *not* empty.
+  def assert_not_empty(collection, message = nil)
+    assert !collection.empty?, message
+  end
+  
+  # Asserts the given path exists
+  # It accepts path/to/be/asserted and automatically make it cross platform.
+  def assert_path_exists(path, message = nil)
+    assert File.exists?(path.to_path), message
+  end
+
+  # Asserts the given path doesn't exists
+  def assert_path_not_exists(path, message = nil)
+    assert !File.exists?(path.to_path), message
+  end
+  
 private
-  def initialize_repository_for_test(&block)
-    repository.prepare_installation
-    create_cache_file
-    create_plugin_directories
-    yield
-    remove_local_repository_path # make sure of clean up tmp dirs
+  def create_test_repository
+    prepare_installation
+    with_path plugins_path do
+      create_cache_file
+      create_plugin_directories
+      create_rails_app
+    end
   end
 
-  def repository
-    create_repository
+  def destroy_test_repository
+    FileUtils.rm_rf local_repository_path
   end
 
-  def create_repository(plugin_name = 'sashimi', url = 'git://github.com/jodosha/sashimi.git')
-    @repository ||= AbstractRepository.new(Plugin.new(plugin_name, url))
+  alias_method :setup, :create_test_repository
+  alias_method :teardown, :destroy_test_repository
+
+  def local_repository_path
+    @local_repository_path ||= [ repository.class.find_home, 'sashimi_test' ].to_path
+  end
+
+  def plugins_path
+    @plugins_path ||= [ local_repository_path, '.rails', 'plugins' ].to_path
+  end
+
+  def rails_app_path
+    @rails_app_path ||= begin 
+      path = [ local_repository_path, '.rails', 'rails_app' ].to_path
+      $rails_app = path
+      path
+    end
+  end
+
+  def repository
+    @repository ||= create_repository
   end
 
   def plugin
-    create_plugin(nil, 'git://github.com/jodosha/sashimi.git')
+    @plugin ||= create_plugin nil, 'git://github.com/jodosha/sashimi.git'
+  end
+
+  def create_repository(plugin_name = 'sashimi', url = 'git://github.com/jodosha/sashimi.git')
+    AbstractRepository.new Plugin.new(plugin_name, url)
   end
   
   def create_plugin(name, url = nil)
     Plugin.new(name, url)
   end
 
-  def cached_plugin
-    { 'sashimi' => {'type' => 'git'}, 
+  def cached_plugins
+    { 'plug-in' => {'type' => 'svn'},
       'plugin'  => {'type' => 'svn'},
-      'plug-in' => {'type' => 'svn'} }
+      'sashimi' => {'type' => 'git'} }
+  end
+
+  def cache_file
+    '.plugins'
   end
 
   def create_plugin_directories
-    { 'plugin' => true, 'plug-in' => false }.each do |plugin, about|
+    { 'sashimi' => true, 'plugin' => true, 'plug-in' => false }.each do |plugin, about|
       create_plugin_directory(plugin, about)
     end
   end
 
   def create_plugin_directory(plugin, about = true)
-    AbstractRepository.change_dir_to_local_repository
-    FileUtils.mkdir(plugin) unless File.exists?(plugin)
-    FileUtils.cd(plugin)
-    File.open('about.yml', 'w+'){|f| f.write({'summary' => "Plugin summary"}.to_yaml)} if about
-    AbstractRepository.change_dir_to_local_repository
+    with_path plugins_path do
+      FileUtils.mkdir(plugin) unless File.exists?(plugin)
+      File.open([ plugin, 'about.yml' ].to_path, 'w+') do |f|
+        f.write({'summary' => "Plugin summary"}.to_yaml)
+      end if about
+    end
   end
 
-  def create_cache_file
-    File.open(repository.cache_file, 'w+'){|f| f.write(cached_plugin.to_yaml)}
+  def create_rails_app
+    FileUtils.mkdir_p [ rails_app_path, 'vendor', 'plugins' ].to_path
   end
 
-  def remove_local_repository_path
-    FileUtils.rm_rf(File.join(repository.class.find_home, 'sashimi_test'))
-  end  
+  def prepare_installation
+    FileUtils.mkdir_p plugins_path
+  end
+
+  def create_cache_file
+    with_path plugins_path do
+      File.open(cache_file, 'w+'){ |f| f.write cached_plugins.to_yaml }
+    end
+  end
+  
+  def with_local_repository_path(&block)
+    with_path(local_repository_path, &block)
+  end
+  
+  def with_path(path, &block)
+    begin
+      old_path = Dir.pwd
+      FileUtils.cd(path)
+      yield
+    ensure
+      FileUtils.cd(old_path)
+    end
+  end
+  
+  def with_clear_cache(&block)
+    AbstractRepository.expire_cache
+    yield
+    create_cache_file
+    AbstractRepository.expire_cache
+  end
 end
 
 module Sashimi
   class AbstractRepository
-    @@local_repository_sub_path = 'sashimi_test/.rails/plugins'
+    @@plugins_path = 'sashimi_test/.rails/plugins'
+    cattr_accessor :plugins_path
+
+    def self.expire_cache #:nodoc:
+      @@cache_content = nil
+    end
+
     public :add_to_cache, :cache_content, :cache_file,
-      :change_dir, :change_dir_to_absolute_plugins_dir,
-      :change_dir_to_local_repository, :change_dir_to_plugin_path,
       :copy_plugin_to_rails_app, :local_repository_path, :path_to_rails_app,
-      :plugins_dir, :prepare_installation, :remove_from_cache,
+      :prepare_installation, :remove_from_cache, :rails_plugins_path,
       :remove_hidden_folders, :rename_temp_folder, :run_install_hook,
-      :write_to_cache
+      :write_to_cache, :with_path, :plugin_path, :absolute_rails_plugins_path
   end
 end
 

data/test/unit/core_ext/array_test.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'test/test_helper'
+
+class ArrayTest < Test::Unit::TestCase
+  uses_mocha 'ArrayTest' do
+    def setup
+      File.stubs(:SEPARATOR).returns '/'
+    end
+
+    def test_to_path  
+      assert_equal 'path/to/app', %w(path to app).to_path
+    end
+
+    def test_to_absolute_path
+      actual = File.dirname(__FILE__)
+      expected = File.expand_path actual
+      assert_equal expected, actual.split(File::SEPARATOR).to_path(true)
+      assert_equal expected, actual.split(File::SEPARATOR).to_absolute_path
+      assert_equal expected, actual.split(File::SEPARATOR).to_abs_path
+    end
+  end
+end

data/test/unit/core_ext/class_test.rb

@@ -10,13 +10,20 @@ class Repository
     another_path
   end
   
-  class_method_proxy :path, :another_path
+  def self.path_with_block(path, &block)
+    block.call(path) if block_given?
+    path
+  end
+  
+  class_method_proxy :path, :another_path, :path_with_block
+  public :path_with_block
 end
 
 class ClassTest < Test::Unit::TestCase
   def test_should_respond_to_proxied_methods
     repository = Repository.new
-    assert repository.send(:path)
-    assert repository.send(:another_path, 'another_path')
+    assert_equal 'path', repository.send(:path)
+    assert_equal 'path', repository.send(:another_path, 'path')
+    assert_equal 'path', repository.path_with_block('path') { |path| path }
   end
 end

data/test/unit/core_ext/string_test.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'test/test_helper'
+
+class StringTest < Test::Unit::TestCase
+  uses_mocha 'StringTest' do
+    def setup
+      File.stubs(:SEPARATOR).returns '/'      
+    end
+    
+    def test_to_path
+      assert_equal 'path/to/app', 'path/to/app'.to_path
+    end
+    
+    def test_to_absolute_path
+      actual = File.dirname(__FILE__)
+      expected = File.expand_path actual
+      assert_equal expected, actual.to_path(true)
+    end
+  end
+end

data/test/unit/plugin_test.rb

@@ -29,10 +29,9 @@ class PluginTest < Test::Unit::TestCase
     assert_kind_of SvnRepository, create_plugin(nil, 'http://dev.repository.com/svn/sashimi/trunk').repository
   end
   
-  def test_should_serialize_to_hash
-    initialize_repository_for_test do
-      expected = {'plugin' => {'type' => 'svn', 'summary' => 'Plugin summary'}}
-      assert_equal(expected, create_plugin('plugin', 'http://dev.repository.com/svn/plugin/trunk').to_hash)
-    end
+  # FIXME
+  def _ignore_test_should_serialize_to_hash
+    expected = {'plug-in' => {'type' => 'svn', 'summary' => nil}}
+    assert_equal(expected, create_plugin('plug-in', 'http://dev.repository.com/svn/plug-in/trunk').to_hash)
   end
 end