ramix 0.1.3 → 0.1.4

data/lib/ramix/builder.rb

@@ -12,7 +12,7 @@ module Ramix
     end
 
     def import(template, *args)
-      @import << proc { template.output(*args) }
+      @import << [template.order, proc { template.output(*args) }]
     end
 
     # Write some useful methods and the content of recipe in the file.
@@ -23,7 +23,7 @@ module Ramix
           file.write preparation_methods
           file.write rails_version
           file.write callback_functions
-          @import.each{ |template|  file.write template.call }
+          ordered_templates.each{ |template|  file.write template[1].call }
           file.write before_callbacks
           file.write callbacks
         end
@@ -40,6 +40,10 @@ module Ramix
       Tempfile.new('template').path
     end
 
+    def ordered_templates
+      @import.sort_by{ |t| t[0] }
+    end
+
     include Ramix::Helpers
 
   end

data/lib/ramix/template.rb

@@ -23,6 +23,10 @@ module Ramix
       @attribute['name'] || @name
     end
 
+    def order
+      @attribute['order'] || 0
+    end
+
     ATTRIBUTE.each do |attr|
       class_eval <<-RUBY
         def #{attr}
@@ -32,10 +36,8 @@ module Ramix
     end
 
     def output(*args)
-      out_buffer = "# >====================== [#{name}] =======================<\n\n"
-      out_buffer << "instance_variable_set '@#{name}', #{args.dup.pop.inspect}\n\n" if args
       <<-OUTPUT
-      #{out_buffer}
+      instance_variable_set '@#{name}', #{args.dup.pop.inspect}
       #{@output}
       OUTPUT
     end

data/lib/ramix/version.rb

@@ -2,7 +2,7 @@ module Ramix
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/ramix.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ramix}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Thierry Zires}]
-  s.date = %q{2012-02-08}
+  s.date = %q{2012-02-17}
   s.description = %q{Ramix is a command-line tool for initializing a new rails application.Just the same as rails but adding more additional options.}
   s.email = %q{zshuaibin@gmail.com}
   s.executables = [%q{ramix}]

data/recipes/authentication.rb

@@ -5,6 +5,7 @@ desc: 'Preconfigure for selected authentication(options: devise/).'
 type: 'string'
 default: 'devise'
 group: 'authentication'
+order: 2
 ---
 
 case @auth

data/recipes/china.rb

@@ -7,4 +7,5 @@ default: false
 group: 'source'
 ---
 say_wizard "Replace gemfile source"
-gsub_file 'Gemfile', "source 'http://rubygems.org'", "source 'http://ruby.taobao.org/'"
+gsub_file 'Gemfile', "source 'http://rubygems.org'", "source 'http://ruby.taobao.org/'"
+gsub_file 'Gemfile', "source 'https://rubygems.org'", "source 'http://ruby.taobao.org/'"

data/recipes/home.rb

@@ -20,8 +20,6 @@ after_bundler do
   gsub_file 'config/routes.rb', /get \"#{@home}\/index\"/, %Q(root :to => "#{@home}#index")
 end
 
-
-
 #DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from <top (required)> at /mnt/projects/ruby-china/config/application.rb:13)
 #:public is no longer used to avoid overloading Module#public, use :public_folder instead
 #  from /home/zires/.rvm/gems/ruby-1.9.3-preview1/gems/resque-1.19.0/lib/resque/server.rb:12:in `<class:Server>'

data/recipes/nosql.rb

@@ -6,6 +6,7 @@ dependence: ['-O']
 type: 'string'
 default: false
 group: 'nosql'
+order: 1
 ---
 
 case @nosql
@@ -13,10 +14,10 @@ when 'mongoid'
   say_wizard "Install mongoid gem"
   case rails_version
   when /3.0/ then gem 'mongoid', '2.2.5'
-  when /3.1/, /3.2/ then gem 'mongoid', '2.4.3'
+  when /3.1/, /3.2/ then gem 'mongoid', '~> 2.4'
   end
 
-  gem 'bson_ext', '1.5.2'
+  gem 'bson_ext', '~> 1.5'
 
   after_bundler do
     say_wizard "Generate mongoid config file and remove database.yml"

data/recipes/omniauth.rb

@@ -5,6 +5,7 @@ desc: 'OmniAuth is a flexible authentication system utilizing Rack middleware.'
 type: 'array'
 group: 'authentication'
 default: ['google', 'facebook', 'twitter']
+order: 3
 ---
 
 if @omniauth == ['china']
@@ -25,23 +26,10 @@ gem 'omniauth'
 end
 
 after_bundler do
-  #say_wizard "Generate authorization model"
-  #generate :model, "Authorization provider:string user_id:integer uid:string -f"
   
   case @auth
   # For devise
   when 'devise'
-    if @nosql
-      # == Mongoid
-      begin
-        inject_into_class "app/models/user.rb", 'User', "  embeds_many :authorizations\n"
-        #inject_into_class "app/models/authorization.rb", 'Authorization', "  embedded_in :user, :inverse_of => :authorizations\n"
-      end if @nosql == 'mongoid'
-    else
-      # == ActiveRecord
-      inject_into_class "app/models/user.rb", 'User', "  has_many :authorizations\n"
-      #inject_into_class "app/models/authorization.rb", 'Authorization', "  belongs_to :user\n"
-    end
     gsub_file 'app/models/user.rb', /:recoverable, :rememberable, :trackable, :validatable/, ':recoverable, :rememberable, :trackable, :validatable, :omniauthable'
     
     insert_into_file 'config/initializers/devise.rb', :before => "# config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'\n" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ramix
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Thierry Zires
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 Z
+date: 2012-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime