sashimi 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,3 +1,41 @@
+* *v0.1.6*
+
+* Tagged v0.1.6
+
+* Prepare for v0.1.6
+
+* Massive changelog
+
+* Added rubyforge project reference to gemspec
+
+* Added sashimi*.gem to .gitignore
+
+* Removed AbstractRepository#cache_file, now uses cattr_accessor
+
+* Updated annotation for AbstractRepository public methods in test/test_helper.rb
+
+* Introduced Class#class_method_proxy in order to make available annotated class methods as private methods
+  
+  Example:
+    class Repository
+      def self.path
+        @@path
+      end
+    
+      class_method_proxy :path
+    end
+
+  Produces:
+    # Proxy method for <tt>Repository#path</tt>
+    def path
+      self.class.path
+    end
+    private :path
+
+* Improved tests for repositories system calls
+
+
+
 * *v0.1.5*
 
 * Tagged v0.1.5

data/lib/sashimi.rb

@@ -6,6 +6,7 @@ require 'yaml'
 require 'fileutils'
 require 'rubygems'
 require 'activesupport'
+require 'sashimi/core_ext'
 require 'sashimi/plugin'
 require 'sashimi/repositories'
 require 'sashimi/version'

data/lib/sashimi/repositories/abstract_repository.rb

@@ -13,6 +13,8 @@ module Sashimi
   class AbstractRepository
     @@local_repository_sub_path = File.join('.rails', 'plugins')
     @@cache_file = '.plugins'
+    cattr_accessor :cache_file
+    
     attr_accessor :plugin
     
     def initialize(plugin)
@@ -117,10 +119,6 @@ module Sashimi
         @local_repository_path ||= File.join(find_home, @@local_repository_sub_path) 
       end
 
-      def cache_file #:nodoc:
-        @@cache_file
-      end
-
       # Return the path to the Rails app where the user launched sashimi command.
       def path_to_rails_app
         $rails_app
@@ -234,52 +232,16 @@ module Sashimi
       FileUtils.rm_rf(plugin.name+'-tmp')
     end
     
+    class_method_proxy :change_dir, :change_dir_to_local_repository,
+      :change_dir_to_absolute_plugins_dir, :local_repository_path,
+      :cache_file, :cache_content, :plugins_dir, :path_to_rails_app
+
   private
-    # Proxy for <tt>AbstractRepository#change_dir</tt>
-    def change_dir(dir)
-      self.class.change_dir(dir)
-    end
-    
-    # Proxy for <tt>AbstractRepository#change_dir_to_local_repository</tt>
-    def change_dir_to_local_repository
-      self.class.change_dir_to_local_repository
-    end
-    
-    # Proxy for <tt>AbstractRepository#change_dir_to_absolute_plugins_dir</tt>
-    def change_dir_to_absolute_plugins_dir
-      self.class.change_dir_to_absolute_plugins_dir
-    end
-    
     # Change the current directory with the plugin one
     def change_dir_to_plugin_path
       change_dir(File.join(local_repository_path, plugin.name || plugin.guess_name))
     end
 
-    # Proxy for <tt>AbstractRepository#local_repository_path</tt>
-    def local_repository_path
-      self.class.local_repository_path
-    end
-    
-    # Proxy for <tt>AbstractRepository#cache_file</tt>
-    def cache_file
-      self.class.cache_file
-    end
-    
-    # Proxy for <tt>AbstractRepository#cache_content</tt>
-    def cache_content
-      self.class.cache_content
-    end
-    
-    # Proxy for <tt>AbstractRepository#plugins_dir</tt>
-    def plugins_dir
-      self.class.plugins_dir
-    end
-    
-    # Proxy for <tt>AbstractRepository#path_to_rails_app</tt>
-    def path_to_rails_app
-      self.class.path_to_rails_app
-    end
-    
     # Prepare the plugin installation
     def prepare_installation
       FileUtils.mkdir_p(local_repository_path)

data/lib/sashimi/repositories/git_repository.rb

@@ -3,14 +3,14 @@ module Sashimi
     def install
       prepare_installation
       puts plugin.guess_name.titleize + "\n\n"
-      system("git clone #{plugin.url}")
+      Kernel.system("git clone #{plugin.url}")
       add_to_cache(plugin.to_hash)
     end
     
     def update
       puts plugin.name.titleize + "\n\n"
       change_dir_to_plugin_path
-      system('git pull')
+      Kernel.system('git pull')
     end
   end
 end

data/lib/sashimi/repositories/svn_repository.rb

@@ -3,14 +3,14 @@ module Sashimi
     def install
       prepare_installation
       puts plugin.guess_name.titleize + "\n\n"
-      system("svn co #{plugin.url} #{plugin.guess_name}")
+      Kernel.system("svn co #{plugin.url} #{plugin.guess_name}")
       add_to_cache(plugin.to_hash)
     end
     
     def update
       puts plugin.name.titleize + "\n\n"
       change_dir_to_plugin_path
-      system("svn up")
+      Kernel.system("svn up")
     end
   end
 end

data/sashimi.gemspec

@@ -1,13 +1,14 @@
 Gem::Specification.new do |s|
   s.name               = "sashimi"
-  s.version            = "0.1.5"
-  s.date               = "2008-05-20"
+  s.version            = "0.1.6"
+  s.date               = "2008-06-23"
   s.summary            = "Rails plugins manager"
   s.author             = "Luca Guidi"
   s.email              = "guidi.luca@gmail.com"
   s.homepage           = "http://lucaguidi.com/pages/sashimi"
   s.description        = "Sashimi is a local repository for Rails plugins."
   s.has_rdoc           = true
+  s.rubyforge_project  = %q{sashimi}
   s.executables        = [ 'sashimi' ]
   s.files              = ["CHANGELOG", "MIT-LICENSE", "Rakefile", "README", "sashimi.gemspec", "setup.rb", "bin/sashimi", "lib/sashimi/commands.rb", "lib/sashimi/plugin.rb", "lib/sashimi/repositories/abstract_repository.rb", "lib/sashimi/repositories/git_repository.rb", "lib/sashimi/repositories/svn_repository.rb", "lib/sashimi/repositories.rb", "lib/sashimi.rb", "test/test_helper.rb", "test/unit/plugin_test.rb", "test/unit/repositories/abstract_repository_test.rb", "test/unit/repositories/git_repository_test.rb", "test/unit/repositories/svn_repository_test.rb"]
   s.test_files         = ["test/unit/plugin_test.rb", "test/unit/repositories/abstract_repository_test.rb", "test/unit/repositories/git_repository_test.rb", "test/unit/repositories/svn_repository_test.rb"]

data/test/test_helper.rb

@@ -65,9 +65,24 @@ end
 module Sashimi
   class AbstractRepository
     @@local_repository_sub_path = 'sashimi_test/.rails/plugins'
-    public :local_repository_path, :change_dir, :prepare_installation,
-      :cache_file, :add_to_cache, :remove_from_cache,
-      :cache_content, :change_dir_to_local_repository,
-      :change_dir_to_plugin_path, :plugins_dir, :copy_plugin_to_rails_app
+    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,
+      :remove_hidden_folders, :rename_temp_folder, :run_install_hook,
+      :write_to_cache
   end
 end
+
+# Thanks to Rails Core Team
+def uses_mocha(description)
+  require 'rubygems'
+  require 'mocha'
+  yield
+rescue LoadError
+  $stderr.puts "Skipping #{description} tests. `gem install mocha` and try again."
+end
+
+def puts(message) #shut-up!
+end

data/test/unit/repositories/git_repository_test.rb

@@ -5,4 +5,28 @@ class GitRepositoryTest < Test::Unit::TestCase
   def test_type
     assert_equal('git', GitRepository.new(nil).scm_type)
   end
-end
+  
+  uses_mocha 'test_git_system_calls_for_install_and_update_process' do
+    def test_should_raise_exception_for_unexistent_repository
+      Kernel.expects(:system).with('git clone unexistent').raises(Errno::ENOENT)
+      repository = GitRepository.new(create_plugin(nil, 'unexistent'))
+      assert_raise(Errno::ENOENT) { repository.install }
+    end
+    
+    def test_should_raise_exception_for_non_repository_url
+      Kernel.expects(:system).with('git clone http://github.com/jodosha.git').raises(Errno::ENOENT)
+      repository = GitRepository.new(create_plugin(nil, 'http://github.com/jodosha.git'))
+      assert_raise(Errno::ENOENT) { repository.install }      
+    end
+    
+    def test_should_create_git_repository
+      initialize_repository_for_test do
+        FileUtils.mkdir_p('sashimi')
+        Kernel.expects(:system).with('git clone git://github.com/jodosha/sashimi.git')
+        GitRepository.new(plugin).install
+        File.expects(:exists?).with('.git').returns(true)
+        assert File.exists?('.git')
+      end
+    end    
+  end
+end

data/test/unit/repositories/svn_repository_test.rb

@@ -5,4 +5,28 @@ class SvnRepositoryTest < Test::Unit::TestCase
   def test_type
     assert_equal('svn', SvnRepository.new(nil).scm_type)
   end
-end
+  
+  uses_mocha 'test_svn_system_calls_for_install_and_update_process' do
+    def test_should_raise_exception_for_unexistent_repository
+      Kernel.expects(:system).with('svn co unexistent unexistent').raises(Errno::ENOENT)
+      repository = SvnRepository.new(create_plugin(nil, 'unexistent'))
+      assert_raise(Errno::ENOENT) { repository.install }
+    end
+    
+    def test_should_raise_exception_for_non_repository_url
+      Kernel.expects(:system).with('svn co http://sushistarweb.com sushistarweb.com').raises(Errno::ENOENT)
+      repository = SvnRepository.new(create_plugin(nil, 'http://sushistarweb.com'))
+      assert_raise(Errno::ENOENT) { repository.install }      
+    end
+    
+    def test_should_create_git_repository
+      initialize_repository_for_test do
+        FileUtils.mkdir_p('sashimi')
+        Kernel.expects(:system).with('svn co http://dev.repository.com/svn/sashimi/trunk sashimi')
+        SvnRepository.new(create_plugin(nil, 'http://dev.repository.com/svn/sashimi/trunk')).install
+        File.expects(:exists?).with('.svn').returns(true)
+        assert File.exists?('.svn')
+      end
+    end    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sashimi
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-20 00:00:00 +02:00
+date: 2008-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: sashimi
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2