alchemy_cms 2.2.rc7 → 2.2.rc8

data/bin/alchemy

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
@@ -30,11 +28,12 @@ class AlchemyInstaller < Thor
   method_option :scm, :type => :string, :aliases => "-s", :desc => "Type of scm (git or svn) to use for this project. Leave blank for none."
   method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
   def new(project)
+    results = []
     @application = project.downcase.strip.gsub(/ /, '_')
     say "Install Alchemy CMS into ./#{@application}", :yellow
     say "Generating new Rails App...", :yellow
     
-    if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
+    if system("rails new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
       
       create_database_yml if options[:database] == 'mysql'
       
@@ -50,14 +49,16 @@ class AlchemyInstaller < Thor
         inject_into_file "#{@application}/config/environments/production.rb", "\n  config.assets.precompile += %w( alchemy/standard_set.css )\n", { :after => sentinel, :verbose => true }
       end
       
+      results << system("cd ./#{@application} && rake db:create alchemy:install:migrations db:migrate alchemy:db:seed")
+      results << system("cd ./#{@application} && rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}")
+
       %x[
         cd ./#{@application}
-        rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}
         rm ./public/index.html
         rm ./app/views/layouts/application.html.erb
         rm ./app/assets/images/rails.png
       ]
-      
+
       if !options[:scm].nil? && !options[:scm].empty?
         
         clean_mountpoint = mountpoint.gsub('/', '')
@@ -132,11 +133,6 @@ GIT
         
       end
       
-      %x[
-        cd ./#{@application}
-        rake db:create alchemy:install:migrations db:migrate alchemy:db:seed
-      ]
-      
       readme = <<-EOF
 
 Successfully installed Alchemy CMS into ./#{@application}
@@ -161,7 +157,7 @@ Thank you for using Alchemy CMS!
 http://alchemy-cms.com
 
 EOF
-      say readme, :green
+      say readme, :green if results.detect { |r| r == false }.nil?
     else
       say "\nError while installation!\n", :red
     end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc7"
+  VERSION = "2.2.rc8"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc7
+  version: 2.2.rc8
   prerelease: 4
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70334678949740 !ruby/object:Gem::Requirement
+  requirement: &70331181302120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70334678949740
+  version_requirements: *70331181302120
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70334678947320 !ruby/object:Gem::Requirement
+  requirement: &70331181301520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334678947320
+  version_requirements: *70331181301520
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70334678945520 !ruby/object:Gem::Requirement
+  requirement: &70331181300780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334678945520
+  version_requirements: *70331181300780
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70334678944660 !ruby/object:Gem::Requirement
+  requirement: &70331181299840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70334678944660
+  version_requirements: *70331181299840
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70334678964220 !ruby/object:Gem::Requirement
+  requirement: &70331181299160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334678964220
+  version_requirements: *70331181299160
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70334678963460 !ruby/object:Gem::Requirement
+  requirement: &70331181298360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334678963460
+  version_requirements: *70331181298360
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70334678962840 !ruby/object:Gem::Requirement
+  requirement: &70331181297520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70334678962840
+  version_requirements: *70331181297520
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70334678961900 !ruby/object:Gem::Requirement
+  requirement: &70331181296980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70334678961900
+  version_requirements: *70331181296980
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70334678960760 !ruby/object:Gem::Requirement
+  requirement: &70331180893820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70334678960760
+  version_requirements: *70331180893820
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70334678958880 !ruby/object:Gem::Requirement
+  requirement: &70331180892420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70334678958880
+  version_requirements: *70331180892420
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70334678976780 !ruby/object:Gem::Requirement
+  requirement: &70331180891480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334678976780
+  version_requirements: *70331180891480
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70334678974800 !ruby/object:Gem::Requirement
+  requirement: &70331180890840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70334678974800
+  version_requirements: *70331180890840
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70334678973460 !ruby/object:Gem::Requirement
+  requirement: &70331180890000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70334678973460
+  version_requirements: *70331180890000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70334678972160 !ruby/object:Gem::Requirement
+  requirement: &70331180888980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,10 +167,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70334678972160
+  version_requirements: *70331180888980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70334678971200 !ruby/object:Gem::Requirement
+  requirement: &70331180888460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334678971200
+  version_requirements: *70331180888460
 - !ruby/object:Gem::Dependency
   name: jasminerice
-  requirement: &70334678986400 !ruby/object:Gem::Requirement
+  requirement: &70331180887520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,7 +189,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334678986400
+  version_requirements: *70331180887520
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de