padrino-admin 0.7.4 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/padrino-admin/generators/admin_app.rb

@@ -41,12 +41,8 @@ module Padrino
           ])
 
           insert_into_gemfile("haml")
-
           template "templates/page/db/seeds.rb.tt", destination_root("/db/seeds.rb")
-
-          if options[:destroy] || !File.read(destination_root("config/apps.rb")).include?("Padrino.mount(\"Admin\").to(\"/#{@app_path}\")")
-            append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/#{@app_path}\")"
-          end
+          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/#{@app_path}\")"
 
           unless options[:destroy]
             say (<<-TEXT).gsub(/ {12}/,'')

data/lib/padrino-admin/generators/admin_uploader.rb

@@ -26,10 +26,6 @@ module Padrino
           @app_root       = File.join(options[:root], options[:admin_path])
           self.behavior   = :revoke if options[:destroy]
 
-          if options[:destroy] || !File.read(destination_root("GemFile")).include?("carrierwave")
-            append_file destination_root("Gemfile"),  "\n\n# Uploader requirements\ngem 'carrierwave'"
-          end
-
           copy_file "templates/uploader/controller.rb",      destination_root(options[:admin_path], "/controllers/uploads.rb")
           copy_file "templates/uploader/views/grid.js.erb",  destination_root(options[:admin_path], "/views/uploads/grid.js.erb")
           copy_file "templates/uploader/views/store.jml",    destination_root(options[:admin_path], "/views/uploads/store.jml")
@@ -54,6 +50,9 @@ module Padrino
             RUBY
           end
 
+          # Add a carrierwave dependency
+          insert_into_gemfile("carrierwave")
+
           # Only for datamapper
           if orm == :datamapper
             inject_into_file destination_root("app", "models", "upload.rb"), :after => "property :file, String" do

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-09}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -356,9 +356,9 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.4"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.7.4"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.7.4"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.5"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.7.5"])
+      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.7.5"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.4"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -367,9 +367,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.4"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.7.4"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.7.4"])
+      s.add_dependency(%q<padrino-core>, ["= 0.7.5"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.7.5"])
+      s.add_dependency(%q<padrino-helpers>, ["= 0.7.5"])
       s.add_dependency(%q<tilt>, [">= 0.4"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -379,9 +379,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.4"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.7.4"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.7.4"])
+    s.add_dependency(%q<padrino-core>, ["= 0.7.5"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.7.5"])
+    s.add_dependency(%q<padrino-helpers>, ["= 0.7.5"])
     s.add_dependency(%q<tilt>, [">= 0.4"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-gen
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-helpers
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt