ubiquo 0.1.12 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -20,8 +20,9 @@ begin
20
20
  "Arnau Sánchez"
21
21
  ]
22
22
  gem.add_dependency(%q<rails>, '= 2.3.5')
23
- gem.add_dependency(%q<rmagick>, '>= 1.15.9')
24
- gem.add_dependency(%q<highline>)
23
+
24
+ gem.add_development_dependency(%q<highline>, '>= 1.5.2')
25
+ gem.add_development_dependency(%q<ya2yaml>, '>= 0.26')
25
26
  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
26
27
  end
27
28
  Jeweler::GemcutterTasks.new
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.12
1
+ 0.2.7
data/bin/ubiquo CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
2
  require 'rubygems'
3
- #require File.join('lib', 'ubiquo.rb')
4
3
  require 'ubiquo'
4
+
5
5
  Ubiquo::App.run!(ARGV)
@@ -8,19 +8,19 @@ module Ubiquo
8
8
  def initialize(args)
9
9
  @orig_args = args.clone
10
10
 
11
- self[:database] = :sqlite
12
11
  self[:template] = :stable
13
12
  self[:profile] = :complete
14
13
  self[:locale] = :en
15
14
  self[:devel] = false
16
15
  self[:gnuine] = args.delete('--gnuine') || false
16
+ self[:database] = self[:gnuine] ? :postgresql : :sqlite
17
17
  self[:exception_recipient] = "chan@ge.me"
18
18
  self[:sender_address] = "chan@ge.me"
19
19
 
20
20
 
21
21
  @opts = OptionParser.new do |o|
22
22
  o.banner = """Usage: #{File.basename($0)} [options] application_name"
23
- o.separator "\nSelect a database (defaults to postgresql if not specified):"
23
+ o.separator "\nSelect a database (defaults to sqlite if not specified):"
24
24
 
25
25
  suported_databases.each do |db,msg|
26
26
  o.on("--#{db.to_s}", msg) { self[:database] = db }
@@ -108,9 +108,9 @@ module Ubiquo
108
108
 
109
109
  def suported_locales
110
110
  {
111
- :ca => "Selects catalan.",
112
- :es => "Selects spanish.",
113
- :en => "Selects english."
111
+ :ca => "Selects Catalan.",
112
+ :es => "Selects Spanish.",
113
+ :en => "Selects English."
114
114
  }
115
115
  end
116
116
 
@@ -109,11 +109,13 @@ base_config: &base_config
109
109
  encoding: unicode
110
110
  adapter: postgresql
111
111
  host: localhost
112
+ username: #{%x{id -u -n}.strip}
113
+ password:
112
114
 
113
115
  development:
114
- <<: *base_config
116
+ <<: *base_config
115
117
  database: #{appname}_development
116
-
118
+
117
119
  test:
118
120
  <<: *base_config
119
121
  database: #{appname}_test
@@ -137,9 +139,9 @@ base_config: &base_config
137
139
  socket: /var/run/mysqld/mysqld.sock
138
140
 
139
141
  development:
140
- <<: *base_config
142
+ <<: *base_config
141
143
  database: #{appname}_development
142
-
144
+
143
145
  test:
144
146
  <<: *base_config
145
147
  database: #{appname}_test
@@ -161,9 +163,9 @@ base_config: &base_config
161
163
  timeout: 5000
162
164
 
163
165
  development:
164
- <<: *base_config
166
+ <<: *base_config
165
167
  database: db/#{appname}_development.db
166
-
168
+
167
169
  test:
168
170
  <<: *base_config
169
171
  database: db/#{appname}_test.db
@@ -217,14 +219,14 @@ Rails::Initializer.run do |config|
217
219
  # -- all .rb files in that directory are automatically loaded.
218
220
 
219
221
  # Add additional load paths for your own custom dirs
220
-
221
- # Specify gems that this application depends on.
222
+
223
+ # Specify gems that this application depends on.
222
224
  # They can then be installed with "rake gems:install" on new installations.
223
225
  # config.gem "bj"
224
226
  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
225
227
  # config.gem "aws-s3", :lib => "aws/s3"
226
- config.gem "rmagick", :lib => 'RMagick'
227
-
228
+ # config.gem "rmagick", :lib => 'RMagick'
229
+
228
230
  # Only load the plugins named here, in the order given (default is alphabetical).
229
231
  # :all can be used as a placeholder for all plugins not explicitly named
230
232
  config.plugins = [ :ubiquo_core, :all ]
@@ -242,7 +244,7 @@ Rails::Initializer.run do |config|
242
244
 
243
245
  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
244
246
  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
245
- # config.i18n.default_locale = :de
247
+ # config.i18n.default_locale = :de
246
248
  config.i18n.load_path += Dir.glob(File.join("config", "locales", "**","*.{rb,yml}"))
247
249
  config.i18n.default_locale = :<%= @opts[:locale] %>
248
250
  end
@@ -256,7 +258,11 @@ plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git',
256
258
 
257
259
  rake("rails:update")
258
260
  rake("calendardateselect:install")
259
- rake("ubiquo:install")
261
+ rake("ubiquo:install OVERWRITE=yes")
262
+
263
+ <% if RUBY_PLATFORM =~ /java/ %>
264
+ generate(:jdbc)
265
+ <% end %>
260
266
 
261
267
  <% if @opts[:gnuine] %>
262
268
  rake("db:create:all")
@@ -267,9 +273,5 @@ git :add => "."
267
273
  git :commit => "-a -m 'Initial #{appname} commit'"
268
274
 
269
275
  <% unless @opts[:gnuine] %>
270
- puts "1.- You must configure your database using config/database.yml"
271
- puts "2.- You must create your databases. rake db:create:all"
272
- puts "3.- You must initialize your database. rake ubiquo:db:init"
273
- puts "4.- You must create the admin user. rake ubiquo:create_user"
274
- puts "5.- scrip/server and point your browser to http://localhost:3000/ubiquo"
276
+ puts "Run script/server and go to http://localhost:3000/ and follow the instructions there."
275
277
  <% end %>
data/ubiquo.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{ubiquo}
8
- s.version = "0.1.12"
8
+ s.version = "0.2.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Albert Callarisa", "Bernat Foj", "Eric Garc\303\255a", "Felip Ladr\303\263n", "Antoni Reina", "Ramon Salvad\303\263", "Arnau S\303\241nchez"]
12
- s.date = %q{2010-04-07}
12
+ s.date = %q{2010-04-27}
13
13
  s.default_executable = %q{ubiquo}
14
14
  s.description = %q{This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.}
15
15
  s.email = %q{rsalvado@gnuine.com}
@@ -42,9 +42,9 @@ Gem::Specification.new do |s|
42
42
  s.rubygems_version = %q{1.3.6}
43
43
  s.summary = %q{command line application for building ubiquo based applications.}
44
44
  s.test_files = [
45
- "test/ubiquo/generator_test.rb",
45
+ "test/helper.rb",
46
46
  "test/ubiquo/options_test.rb",
47
- "test/helper.rb"
47
+ "test/ubiquo/generator_test.rb"
48
48
  ]
49
49
 
50
50
  if s.respond_to? :specification_version then
@@ -53,17 +53,17 @@ Gem::Specification.new do |s|
53
53
 
54
54
  if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
55
55
  s.add_runtime_dependency(%q<rails>, ["= 2.3.5"])
56
- s.add_runtime_dependency(%q<rmagick>, [">= 1.15.9"])
57
- s.add_runtime_dependency(%q<highline>, [">= 0"])
56
+ s.add_development_dependency(%q<highline>, [">= 1.5.2"])
57
+ s.add_development_dependency(%q<ya2yaml>, [">= 0.26"])
58
58
  else
59
59
  s.add_dependency(%q<rails>, ["= 2.3.5"])
60
- s.add_dependency(%q<rmagick>, [">= 1.15.9"])
61
- s.add_dependency(%q<highline>, [">= 0"])
60
+ s.add_dependency(%q<highline>, [">= 1.5.2"])
61
+ s.add_dependency(%q<ya2yaml>, [">= 0.26"])
62
62
  end
63
63
  else
64
64
  s.add_dependency(%q<rails>, ["= 2.3.5"])
65
- s.add_dependency(%q<rmagick>, [">= 1.15.9"])
66
- s.add_dependency(%q<highline>, [">= 0"])
65
+ s.add_dependency(%q<highline>, [">= 1.5.2"])
66
+ s.add_dependency(%q<ya2yaml>, [">= 0.26"])
67
67
  end
68
68
  end
69
69
 
metadata CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
4
4
  prerelease: false
5
5
  segments:
6
6
  - 0
7
- - 1
8
- - 12
9
- version: 0.1.12
7
+ - 2
8
+ - 7
9
+ version: 0.2.7
10
10
  platform: ruby
11
11
  authors:
12
12
  - Albert Callarisa
@@ -20,7 +20,7 @@ autorequire:
20
20
  bindir: bin
21
21
  cert_chain: []
22
22
 
23
- date: 2010-04-07 00:00:00 +02:00
23
+ date: 2010-04-27 00:00:00 +02:00
24
24
  default_executable: ubiquo
25
25
  dependencies:
26
26
  - !ruby/object:Gem::Dependency
@@ -38,7 +38,7 @@ dependencies:
38
38
  type: :runtime
39
39
  version_requirements: *id001
40
40
  - !ruby/object:Gem::Dependency
41
- name: rmagick
41
+ name: highline
42
42
  prerelease: false
43
43
  requirement: &id002 !ruby/object:Gem::Requirement
44
44
  requirements:
@@ -46,13 +46,13 @@ dependencies:
46
46
  - !ruby/object:Gem::Version
47
47
  segments:
48
48
  - 1
49
- - 15
50
- - 9
51
- version: 1.15.9
52
- type: :runtime
49
+ - 5
50
+ - 2
51
+ version: 1.5.2
52
+ type: :development
53
53
  version_requirements: *id002
54
54
  - !ruby/object:Gem::Dependency
55
- name: highline
55
+ name: ya2yaml
56
56
  prerelease: false
57
57
  requirement: &id003 !ruby/object:Gem::Requirement
58
58
  requirements:
@@ -60,8 +60,9 @@ dependencies:
60
60
  - !ruby/object:Gem::Version
61
61
  segments:
62
62
  - 0
63
- version: "0"
64
- type: :runtime
63
+ - 26
64
+ version: "0.26"
65
+ type: :development
65
66
  version_requirements: *id003
66
67
  description: This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.
67
68
  email: rsalvado@gnuine.com
@@ -120,6 +121,6 @@ signing_key:
120
121
  specification_version: 3
121
122
  summary: command line application for building ubiquo based applications.
122
123
  test_files:
123
- - test/ubiquo/generator_test.rb
124
- - test/ubiquo/options_test.rb
125
124
  - test/helper.rb
125
+ - test/ubiquo/options_test.rb
126
+ - test/ubiquo/generator_test.rb