ubiquo 0.1.2 → 0.1.3

data/Rakefile

@@ -13,7 +13,6 @@ begin
     gem.authors = ["Ramon Salvadó"]
     gem.add_dependency(%q<rails>, ["= 2.3.5"])
     gem.add_dependency(%q<rmagick>, [">= 1.15.9"])
-    gem.add_development_dependency(%q<mocha>)
     gem.add_dependency(%q<highline>)
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/ubiquo.rb

@@ -12,11 +12,15 @@ module Ubiquo
         options = Options.new(arguments)
         options = options.merge(env_opts) if env_opts
 
-
         if `which git` == ''
           $stderr.puts "Sorry you need to install git (> 1.5.3). See http://git-scm.com/"
           options[:show_help] = true
         end
+
+        if options[:version]
+          $stdout.puts options[:version]
+          return 0
+        end
         
         if options[:invalid_argument]
           $stderr.puts options[:invalid_argument]
@@ -33,6 +37,7 @@ module Ubiquo
           return 1
         end
 
+        
         skeleton = File.dirname(__FILE__) + "/ubiquo/template.erb"
         tpl = Tempfile.new('tmp')
         File.open(tpl.path, 'w') do |file|

data/lib/ubiquo/options.rb

@@ -18,29 +18,33 @@ module Ubiquo
       
       @opts = OptionParser.new do |o|
         o.banner = """Usage: #{File.basename($0)} [options] application_name"        
-        o.separator ""
+        o.separator "\nSelect a database (defaults to postgresql if not specified):"
         
         suported_databases.each do |db,msg|
           o.on("--#{db.to_s}", msg) { self[:database] = db }
         end
         
-        o.separator ""
+        o.separator "\nSelect a template (defaults to stable if not specified):"
         
         suported_templates.each do |tpl, msg|
           o.on("--#{tpl.to_s}", msg) { self[:template] = tpl }
         end
         
-        o.separator ""
+        o.separator "\nSelect a profile (defaults to complete if not specified):"
         
         suported_profiles.each do |profile, msg|
           o.on("--#{profile.to_s}", msg) { self[:profile] = profile }
         end
 
+        o.separator "\nExtra options:"
+
         o.on("--devel", 'For ubiquo developers (ssh acces to github repos)') do
           self[:devel] = true
         end
-        
-        o.separator ""
+
+        o.on("-v", '--version', "Displays this gem version.") do
+          self[:version] = File.read(File.dirname(__FILE__) + "/../../VERSION").strip
+        end
         
         o.on_tail('-h', '--help', 'displays this help and exit') do
           self[:show_help] = true
@@ -79,7 +83,7 @@ module Ubiquo
     
     def suported_profiles
       {
-        :minimal  => "Includes minimal set of ubiquo plugins: ubiquo_core, ubiquo_authentication and ubiquo_scaffold.",
+        :minimal  => "Includes minimal set of ubiquo plugins.",
         :complete => "Includes all avaliable ubiquo core plugins."
       }
     end

data/lib/ubiquo/template.erb

@@ -5,11 +5,9 @@ external_plugins = %w[
   tiny_mce
   paperclip
 ]
-minimal_plugins = %w[ ubiquo_core ubiquo_authentication ]
+minimal_plugins = %w[ ubiquo_core ubiquo_authentication ubiquo_access_control ubiquo_scaffold ]
 rest_plugins = %w[
-  ubiquo_access_control
   ubiquo_media
-  ubiquo_scaffold
   ubiquo_jobs
   ubiquo_i18n
   ubiquo_activity

data/test/ubiquo/options_test.rb

@@ -41,4 +41,11 @@ class TestOptions < Test::Unit::TestCase
     assert_equal "invalid option: --wrong", opts[:invalid_argument]
   end
 
+  def test_should_have_a_version
+    opts = Options.new(%w[ --version myapp])
+    version_file = File.dirname(__FILE__) + "/../../VERSION"
+    version = File.read(version_file).strip
+    assert_equal version, opts[:version]
+  end
+  
 end

data/ubiquo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ubiquo}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Salvad\303\263"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-23}
   s.default_executable = %q{ubiquo}
   s.description = %q{This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.}
   s.email = %q{rsalvado@gnuine.com}
@@ -54,18 +54,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 2.3.5"])
       s.add_runtime_dependency(%q<rmagick>, [">= 1.15.9"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["= 2.3.5"])
       s.add_dependency(%q<rmagick>, [">= 1.15.9"])
-      s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, ["= 2.3.5"])
     s.add_dependency(%q<rmagick>, [">= 1.15.9"])
-    s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 0"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Ramon Salvad\xC3\xB3"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +01:00
 default_executable: ubiquo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,22 +45,10 @@ dependencies:
         version: 1.15.9
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -68,7 +56,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.
 email: rsalvado@gnuine.com
 executables: