fetty-generators 2.0.1 → 2.0.3

data/lib/generators/fetty/authentication/authentication_generator.rb

@@ -16,7 +16,7 @@ module Fetty
         else
           unless using_fetty_authentication?
             @orm = using_mongoid? ? 'mongoid' : 'active_record'
-            add_gem { gem "bcrypt-ruby", :require => "bcrypt" }
+            gem "bcrypt-ruby", :require => "bcrypt"
             generate_users
             generate_sessions
             generate_reset_passwords

data/lib/generators/fetty/messages/messages_generator.rb

@@ -21,7 +21,7 @@ module Fetty
           if file_exists?(@model_path)
             unless using_mongoid?
               @orm = using_mongoid? ? 'mongoid' : 'active_record'
-              add_gem { gem "ancestry" }
+              gem "ancestry"
               copy_models_and_migrations
               copy_controller_and_helper
               copy_views

data/lib/generators/fetty/scaffold/scaffold_generator.rb

@@ -25,7 +25,7 @@ module Fetty
         print_usage unless scaffold_name.underscore =~ /^[a-z][a-z0-9_\/]+$/ && !attributes.empty?
         print_usage unless attributes.drop_while { |arg| arg.include?(':') }.count == 0
         
-        if check_required_gems? "jquery-rails", "simple_form", "kaminari", "ckeditor", "carrierwave"
+        if check_required_gems? "jquery-rails", "simple_form", "kaminari"
           @orm = using_mongoid? ? 'mongoid' : 'active_record'
           
           setting_model_attributes
@@ -49,7 +49,7 @@ module Fetty
             generate_specs if using_rspec?
           end
         else
-          raise "Missing gems: jquery-rails, simple_form, kaminari, ckeditor, carrierwave"
+          raise "Missing gems: jquery-rails simple_form kaminari"
         end
       rescue Exception => e
          print_notes(e.message,"error",:red)

data/lib/generators/fetty/setup/setup_generator.rb

@@ -23,13 +23,15 @@ module Fetty
         @selected_gems = options.only.empty? ? options.reject { |k,v| k == "only" || k == "mongoid" || v == false }.keys : options.only
         @selected_gems.each do |gems|
           asking "Would you like to setup #{gems} gem?" do
-            send("setup_#{gems}")
+            send("setup_#{gems.gsub('-','_')}")
           end
         end
-        remove_file 'public/index.html' if file_exists?('public/index.html')
-        remove_file 'public/images/rails.png' if file_exists?('public/images/rails.png')
-        print_notes("Refreshing Bundle")
-        refresh_bundle
+        if options.only.empty?
+          remove_file 'public/index.html' if file_exists?('public/index.html')
+          remove_file 'public/images/rails.png' if file_exists?('public/images/rails.png')
+          print_notes("Refreshing Bundle")
+          refresh_bundle
+        end
       rescue Exception => e
         print_notes(e.message,"error",:red)
       end
@@ -37,10 +39,8 @@ module Fetty
 private
       
       def setup_mongoid
-        add_gem do
-          gem "bson_ext"
-          gem "mongoid"
-        end
+        gem "bson_ext"
+        gem "mongoid"
         generate("mongoid:config")
         set_application_config { "  config.mongoid.preload_models = true\n" }
       rescue Exception => e
@@ -48,7 +48,7 @@ private
       end
       
       def setup_cancan
-        add_gem { gem "cancan" }
+        gem "cancan"
         copy_file 'ability.rb', 'app/models/ability.rb'
         inject_into_class 'app/controllers/application_controller.rb', ApplicationController do
           "  rescue_from CanCan::AccessDenied do |exception| flash[:alert] = exception.message; redirect_to root_url end;\n"
@@ -58,24 +58,22 @@ private
       end
       
       def setup_jquery_rails
-        add_gem { gem "jquery-rails" }
+        gem "jquery-rails"
         generate("jquery:install")
       rescue Exception => e
         raise e
       end
       
       def setup_simple_form
-        add_gem { gem "simple_form" }
+        gem "simple_form"
         generate("simple_form:install")
       rescue Exception => e
         raise e
       end
       
       def setup_carrierwave
-        add_gem do
-          gem "mini_magick"
-          gem "carrierwave"
-        end
+        gem "mini_magick"
+        gem "carrierwave"
         copy_file 'image_uploader.rb', 'app/uploaders/image_uploader.rb'
         copy_file 'file_uploader.rb', 'app/uploaders/file_uploader.rb'
         print_notes("carrierwave will use mini_magick by default!")
@@ -84,7 +82,7 @@ private
       end
       
       def setup_kaminari
-        add_gem { gem "kaminari" }
+        gem "kaminari"
       rescue Exception => e
         raise e
       end
@@ -94,11 +92,11 @@ private
         destroy("public/javascripts/ckeditor")
         ver = ask("==> What version of CKEditor javascript files do you need? [default 3.5.4]")
         if ver == "3.5.4" || ver.blank?
-          add_gem { gem "ckeditor", "3.5.4" }
+          gem "ckeditor", "3.5.4"
           template "ckeditor.rb", "config/initializers/ckeditor.rb"
           extract("setup/templates/ckeditor.tar.gz","public/javascripts","ckeditor")
         else
-          add_gem { gem "ckeditor", ver }
+          gem "ckeditor", ver
           generate("ckeditor:base --version=#{ver}")
         end
       rescue Exception => e
@@ -109,18 +107,16 @@ private
         # remove the existing install (if any)
         destroy("Guardfile")
         
-        add_gem do
-          gem 'rspec-rails', :group => [:development, :test]
-          gem 'capybara', :group => [:development, :test] 
-          gem 'factory_girl_rails', :group => [:development, :test] 
-          gem 'faker', :group => [:development, :test] 
-          gem 'database_cleaner', :group => [:development, :test]
-          gem 'escape_utils', :group => [:development, :test]
-          gem 'guard-rspec', :group => [:development, :test]
-          if RUBY_PLATFORM =~ /darwin/i
-              gem 'rb-fsevent', :group => [:development, :test], :require => false
-              gem 'growl', :group => [:development, :test]
-          end
+        gem 'rspec-rails', :group => [:development, :test]
+        gem 'capybara', :group => [:development, :test] 
+        gem 'factory_girl_rails', :group => [:development, :test] 
+        gem 'faker', :group => [:development, :test] 
+        gem 'database_cleaner', :group => [:development, :test]
+        gem 'escape_utils', :group => [:development, :test]
+        gem 'guard-rspec', :group => [:development, :test]
+        if RUBY_PLATFORM =~ /darwin/i
+            gem 'rb-fsevent', :group => [:development, :test], :require => false
+            gem 'growl', :group => [:development, :test]
         end
         
         copy_file 'escape_utils.rb', 'config/initializers/escape_utils.rb'
@@ -132,10 +128,8 @@ private
         
         asking "Would you like to install Cucumber?" do
           destroy("features")
-          add_gem do
-            gem "cucumber-rails", :group => [:development, :test]
-            gem "guard-cucumber", :group => [:development, :test] 
-          end
+          gem "cucumber-rails", :group => [:development, :test]
+          gem "guard-cucumber", :group => [:development, :test] 
           generate("cucumber:install", "--rspec", "--capybara")
           template 'env.rb', 'features/support/env.rb', :force => true
           `guard init cucumber`

data/lib/generators/fetty/views/USAGE

@@ -2,4 +2,4 @@ Description:
 	The fetty:views generator creates a basic layout, stylesheet and
 	helper which will give some structure to starting your Rails app.
 	
-	Also able to convert your template views from ERB to HAML or vice versa.
+	Also able to convert your template views from ERB to HAML.

data/lib/generators/fetty/views/views_generator.rb

@@ -4,16 +4,14 @@ module Fetty
   module Generators
     class ViewsGenerator < Base
       
-      argument :arg, :type => :string, :required => true, :banner => 'layout | erb:to:haml | haml:to:erb'
+      argument :arg, :type => :string, :required => true, :banner => 'layout | erb_to_haml'
       
       def generate_views
         case arg
         when "layout"
-          generate_layout 
-        when "erb:to:haml"
+          generate_layout
+        when "erb_to_haml"
           erb_to_haml
-        when "haml:to:erb"
-          haml_to_erb
         end
       rescue Exception => e
         print_notes(e.message,"error",:red)
@@ -37,50 +35,32 @@ private
       def erb_to_haml
         asking "Are you sure want to convert all your views from ERB to HAML ?" do
           # => Cycles through the views folder and searches for erb files
-          # prepare_convert_gems
-          # Dir.glob("app/views/**/*.erb").each do |file|
-          #   puts "Convert ERB: #{file}"
-          #   unless file_exists? file.gsub(/erb$/, "haml")
-          #     `html2haml #{file} | cat > #{file.gsub(/erb$/, "haml")}`
-          #     File.delete(file)
-          #   end
-          # end
-        end
-      rescue Exception => e
-        raise e
-      end
-      
-      def haml_to_erb
-        asking "Are you sure want to convert all your views from HAML to ERB ? [yes]" do
-          # => Cycles through the views folder and searches for haml files
+          prepare_convert_gems
+          ::Bundler.with_clean_env do
+            Dir.glob("app/views/**/*.erb").each do |file|
+              out_file = file.gsub(/erb$/, "haml")
+              unless file_exists? out_file
+                puts "Convert ERB: #{file} => HAML: #{out_file}"
+                `html2haml #{file} | cat > #{out_file}`
+                File.delete(file) if $? == 0
+              else
+                puts "WARNING: '#{out_file}' already exists!"
+              end
+            end
+          end
         end
       rescue Exception => e
         raise e
       end
       
       def prepare_convert_gems
-        # install_gem "haml-rails" unless check_installed_gem? "haml-rails"
-        # install_gem "hpricot" unless check_installed_gem? "hpricot"
-        # install_gem "ruby_parser" unless check_installed_gem? "ruby_parser"
+        gem "haml-rails"
+        install_local_gem "hpricot" unless check_local_gem? "hpricot"
+        install_local_gem "ruby_parser" unless check_local_gem? "ruby_parser"
       rescue Exception => e
         raise e
       end
       
-      def convert_views(in_type,out_type)
-        # Dir["app/views/**/*.#{in_type}"].each do |file_name|
-        #   puts "Convert #{first_type.capitalize}: #{file_name}"
-        #   out_file_name = file_name.gsub(/#{first_type}$/, second_type)
-        #   unless file_exists? out_file_name
-        #     erb_string = File.open(file_name).read
-        #     haml_string = Haml::HTML.new(erb_string, :erb => true).render
-        #     f = File.new(haml_file_name, "w")
-        #     f.write(haml_string)
-        #     File.delete(file_name)
-        #   end
-        # end
-      rescue Exception => e
-        raise e
-      end
       
     end
   end

data/lib/generators/fetty.rb

@@ -16,13 +16,6 @@ module Fetty
       
 protected
       
-      def add_gem(&block)
-        yield
-        refresh_bundle
-      rescue Exception => e
-        raise e
-      end
-      
       def root_path(path)
         File.expand_path(File.join(File.dirname(__FILE__), 'fetty', path))
       end
@@ -193,3 +186,7 @@ protected
   end
 end
 
+# => set callback on when calling +gem+
+set_trace_func proc { |event, file, line, id, binding, classname| 
+  ::Bundler.with_clean_env { `bundle` } if classname == Rails::Generators::Actions && id == :gem && event == 'return'
+}

data/lib/generators/scaffold.rb

@@ -18,8 +18,10 @@ module Fetty
              if arg.include?(':file') || arg.include?(':image') || arg.include?(':editor')
                self.special_types[arg.split(':').first] = arg.split(':').last.to_sym
                if arg.include?(':editor')
+                 raise "Missing gems: ckeditor" unless check_required_gems? "ckeditor"
                  self.model_attributes << Rails::Generators::GeneratedAttribute.new(arg.split(':').first, "text")
                else
+                 raise "Missing gems: carrierwave" unless check_required_gems? "carrierwave"
                  self.model_attributes << Rails::Generators::GeneratedAttribute.new(arg.split(':').first, "string")
                end
              else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetty-generators
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000Z
+date: 2011-08-19 00:00:00.000000000Z
 dependencies: []
 description: This generators provide you to easily setup your Rails 3 application,
   create authentication, messages, admin style scaffolding and many more