fnando-pez 0.0.2 → 0.0.4

data/History.txt

@@ -1,4 +1,19 @@
 == 0.0.1 2008-09-01
 
 * 1 major enhancement:
-  * Initial release
+  * Initial release
+
+== 0.0.2 2008-09-01
+
+* 1 minor enhancement:
+  * Added symlink option
+
+== 0.0.3 2008-09-02
+
+* 1 bug fix:
+  * Some methods was trying to access a nil object; expected a hash
+
+== 0.0.4 2008-09-03
+
+* 1 major enhancement:
+  * Added revision and branch support

data/README.markdown

@@ -37,15 +37,50 @@ USAGE:
 
 Run the command `pez setup` from your project root to create the file 
 `config/plugins.yml`. Then you can manage plugins with the following commands:
-
+	
+	# display general help
+	pez help
+	
+	# display help for specific command
+	pez help [command]
+	
+	# add a new plugin
 	pez add git://github.com/fnando/has_cache.git
+	
+	# add a new plugin and specify repository type [svn, git]
 	pez add http://some-url.com/fnando/has_cache --type=svn
+	
+	# update the repository
 	pez update has_cache
+	
+	# update all repositories
 	pez update --all
+	
+	# show info from all repositories
 	pez show --all
+	
+	# remove plugin
 	pez remove has_cache
+	
+	# remove all plugins
 	pez remove --all
+	
+	# create symlink for plugins already added
 	pez symlink
+	
+	# add plugin and track a specific branch (git only)
+	pez add git://github.com/aslakhellesoy/cucumber -b html-visitor
+	
+	# add plugin and freeze in a specific commit
+	pez add git://github.com/aslakhellesoy/cucumber \
+		-r 32d4f03d19bf33172bb7b48fed48e906a56598a7
+	
+	# add plugin and freeze in a specific revision
+	pez add svn://some/plugin -r 189
+
+NOTE: If you specify a revision (-r or --revision), you won't be able to
+update the repository. To update it, edit the config/plugins.yml file 
+and remove the revision option.
 
 MAINTAINER
 ----------

data/Rakefile

@@ -5,7 +5,7 @@ PKG_FILES = %w(Rakefile pez.gemspec History.txt License.txt README.markdown TODO
 
 spec = Gem::Specification.new do |s|
   s.name = "pez"
-  s.version = "0.0.2"
+  s.version = "0.0.4"
   s.summary = "Manage Ruby on Rails plugins from GIT and Subversion repositories in a simple way"
   s.authors = ["Nando Vieira"]
   s.email = ["fnando.vieira@gmail.com"]

data/bin/pez

@@ -38,10 +38,10 @@ Main {
       . pez add git://remote/path --name=some_plugin_name
     TXT
 
-    mixin :argument_url, :option_type, :option_name
+    mixin :argument_url, :option_type, :option_name, :option_revision, :option_branch
 
     run {
-      Pez::Command.add(url, { :type => type, :name => name })
+      Pez::Command.add(url, { :type => type, :name => name, :revision => revision, :branch => branch })
     }
   }
 
@@ -158,6 +158,24 @@ Main {
     }
   }
   
+  mixin(:option_revision) {
+    option(:revision, :r) {
+      optional
+      argument :required
+      desc 'freezes a specific revision'
+      attr
+    }
+  }
+  
+  mixin(:option_branch) {
+    option(:branch, :b) {
+      optional
+      argument :required
+      desc 'checkout a specific GIT branch'
+      attr
+    }
+  }
+  
   mixin(:option_name) {
     option(:name, :n) {
       optional

data/lib/pez/base.rb

@@ -1,5 +1,5 @@
 module Pez
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
   CONFIG_FILE = File.dirname(__FILE__) + '/../../templates/plugins.yml'
   
   module Base
@@ -26,7 +26,12 @@ module Pez
     def self.add_to_config(name, url, options={})
       c = config
       c['plugins'] ||= {}
-      c['plugins'][name] = {'repo' => url, 'type' => options[:type]}
+      c['plugins'][name] = {
+        'repo' => url, 
+        'type' => options[:type], 
+        'revision' => options[:revision], 
+        'branch' => options[:branch]
+      }.reject {|key, value| value.nil? }
       
       File.open('config/plugins.yml', 'w+') do |f|
         f << YAML::dump(c)
@@ -42,8 +47,8 @@ module Pez
         f << YAML::dump(c)
       end
       
-      system "rm -rf #{destination}/#{name}"
-      system "rm vendor/plugins/#{name}"
+      system %( rm -rf #{destination}/#{name} )
+      system %( rm vendor/plugins/#{name} )
     end
     
     def self.destination
@@ -54,7 +59,7 @@ module Pez
       if name
         [name]
       elsif options[:all]
-        Pez::Base.config["plugins"].keys
+        (Pez::Base.config["plugins"] || {}).keys
       else
         []
       end
@@ -76,20 +81,49 @@ module Pez
     
     def self.add(url, options={}, skip_config=false)
       name = Pez::Base.name(url, options)
-      
+
       puts "Retrieving #{name}..."
       
       if Pez::Base.git?(url, options)
         options[:type] = "git"
-        system "mkdir -p #{Pez::Base.destination}; cd #{Pez::Base.destination}; git clone #{url} #{name}"
+        
+        system %(
+          mkdir -p #{Pez::Base.destination}
+          cd #{Pez::Base.destination}
+          git clone #{url} #{name}
+        )
+        
+        if branch = options[:branch]
+          system %(
+            cd #{Pez::Base.destination}/#{name}
+            git checkout --track -b #{branch} origin/#{branch}
+          )
+        end
+        
+        if revision = options[:revision]
+          system %( 
+            cd #{Pez::Base.destination}/#{name}
+            git branch #{revision}
+            git checkout #{revision}
+          )
+        end
       else
         options[:type] = "svn"
-        system "mkdir -p #{Pez::Base.destination}; cd #{Pez::Base.destination}; svn co #{url} #{name}"
+        
+        if revision = options[:revision]
+          options[:revision] = revision.to_i
+        end
+        
+        system %(
+          mkdir -p #{Pez::Base.destination}
+          cd #{Pez::Base.destination}
+          svn co #{url} #{name} -r #{options[:revision] || 'HEAD'}
+        )
       end
       
       puts
       Pez::Base.add_to_config(name, url, options) unless skip_config
-      system "ln -s #{Pez::Base.destination}/#{name} vendor/plugins/#{name}"
+      system %( ln -s #{Pez::Base.destination}/#{name} vendor/plugins/#{name} )
     end
     
     def self.remove(name=nil, options={})
@@ -107,12 +141,27 @@ module Pez
         
         if File.directory?(dirname)
           if data['type'] == 'git'
-            system "cd #{dirname}; git pull"
+            if data['revision']
+              puts "Will not be updated; it's freezed at commit #{data['revision']}"
+            else
+              system %(
+                cd #{dirname}
+                git checkout #{options[:branch] || 'master'}
+                git pull
+              )
+            end
           else
-            system "cd #{dirname}; svn up"
+            if data['revision']
+              puts "Will not be updated; it's freezed at revision #{data['revision']}"
+            else
+              system %( 
+                cd #{dirname}
+                svn up
+              )
+            end
           end
         else
-          add(data['repo'], {:type => data['type'], :name => name}, true)
+          add(data['repo'], data.merge(:name => name), true)
         end
         
         puts
@@ -126,7 +175,7 @@ module Pez
         dirname = "#{Pez::Base.destination}/#{name}"
         
         if File.directory?(dirname)
-          system "ln -s #{dirname} vendor/plugins/#{name}"
+          system %( ln -s #{dirname} vendor/plugins/#{name} )
         else
           add(data['repo'], {:type => data['type'], :name => name}, true)
         end

data/pez.gemspec

@@ -2,11 +2,11 @@
 # RUN : 'rake gem:update_gemspec'
 
 Gem::Specification.new do |s|
-  s.date = "Mon Sep 01 21:04:00 -0300 2008"
+  s.date = "Wed Sep 03 14:19:21 -0300 2008"
   s.executables = ["pez"]
   s.authors = ["Nando Vieira"]
   s.required_rubygems_version = ">= 0"
-  s.version = "0.0.2"
+  s.version = "0.0.4"
   s.files = ["Rakefile",
  "pez.gemspec",
  "History.txt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-pez
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 17:04:00 -07:00
+date: 2008-09-03 10:19:21 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency