kitty_gen 0.0.16 → 0.0.17

data/Gemfile

@@ -2,3 +2,4 @@ source :rubygems
 
 # Specify your gem's dependencies in foodie.gemspec
 gemspec
+gem "omniauth"

data/README.textile

@@ -1,6 +1,6 @@
 h1. KittyGen: Rails 3.1 Application Template Management System
 
-Shave hours off your next project and amaze your client and friends. This productivity crazed "rails developer in london":http://www.jackkinsella.ie/rails-developer-london has put all his favourite configurations and gems into this Rails 3.1 app generator. How would you like:
+Shave hours off your next project and amaze your client and friends. This productivity crazed "rails developer in london":http://www.jackkinsella.ie/rails-developer-london.html has put all his favourite configurations and gems into this Rails 3.1 app generator. How would you like:
 
 # To have a unique RVM gemset setup automatically with an rvmrc file already trusted
 # Have watchr running your unit and integrations tests on save, notifying you on Growl, working out of the box
@@ -13,22 +13,25 @@ Shave hours off your next project and amaze your client and friends. This produc
 # All those annoying files you never use removed
 
 Unlike other application templates this one is *packaged in a gem* meaning you can call it from the command line as simply as this:
-  @$ kitty_new new MY_NEW_APP_NAME@
+  @$ kitty_gen new MY_NEW_APP_NAME@
 
 Not only that, but kitty_gen lets you *upgrade existing applications with its modules*. Want to setup "livereload"? Easy
 
- @$ kitty_new list #list all your recipes@ 
+ @$ kitty_gen add livereload@ 
 
- @$ kitty_new add livereload@ 
+And to see a list of all available recipes:
+
+ @$ kitty_gen list@
 
 h2. Design Decisions
 
 # This is Mac only and will remain Mac only. Sorry. 
 # Each recipe is self-contained and so should include all the gems, bundling and generation it needs to do its thing. Yes the generator is slower this way, but the advantage is modularity.
 # Gems are installed inline instead of in one big file.
-# Rspec and Cucumber are not included by default because this package is meant produtive developers who shiver at the thought of Cuucmber or Rspec's wordy syntax and added configuration load. See DHH.
-# A commit is made after every step.
+# Rspec and Cucumber are not included by default since the new best practice is to stay with Test::Unit. DHH was right all along.
+# A commit is made after every step with a descriptive message.
 # Each recipe is in its own namespace meaning that variables you assign in one recipe do not carry over to others
+#[not implemented] Your ~/.kitty_gen.rc file will contain the default recipes you use for new apps, alongside configuration information such as your aws, postgres password, paypal details, email address and son.
 
 h2. Features
 

data/lib/kitty_gen.rb

@@ -1,5 +1,7 @@
 module KittyGen
-
-  require "kitty_gen/cli"
-  
+   require "kitty_gen/cli"
+   require "rails/generators"
+   require "rails"
+   require 'rails/generators/rails/app/app_generator'
+   require "kitty_gen/helpers"
 end

data/lib/kitty_gen/cli.rb

@@ -1,5 +1,6 @@
 module KittyGen
   class Cli 
+   require "kitty_gen/cook"
 
     def start(command_line_arguments)
       case ARGV[0]
@@ -10,36 +11,54 @@ module KittyGen
       when "add"
         add(ARGV[1])
       else
-        %Q{Commands available: 
-          kitty_gen new APPNAME  # create a new app APPNAME using preffered recipes
-          kitty_gen list         # lists available recipes
-          kitty_gen add RECIPE   # adds a recipe RECIPE
-        }
+        puts help
       end
     end
 
     private
 
     def new(app_name)
-      exec "rails new #{app_name} -m #{master_template}"
+      exec "rails new #{app_name}"
+      run_generator(master_template)
     end
 
     def list
-      recipe_list = File.read(File.join(kitty_gen_dir, "base_recipes")).split("\n").reject {|r| r.match /^\s*#/}.join("\n  ")
       puts <<-MESSAGE
+
 ##  Kitty Gen ##
 ##  Listing all possible recipes you can add to your application ##
 
-#{"  " + recipe_list}
+#{recipes.map.with_index {|recipe, index| "  #{index}: #{recipe} "}.join("\n")}
+
+USAGE:       kitty_gen add recipe_name_or_number
+EXAMPLE:     kitty_gen add formtastic
+             kitty_gen add 5
+      MESSAGE
+    end
+
+    def recipes
+      File.read(File.join(kitty_gen_dir, "base_recipes")).split("\n").reject {|r| r.match /^\s*#/}
+    end
+    
+    # Examples: 
+    # add(formtastic)
+    # add(3)
+    def add(recipe_or_index)
+      if is_a_number?(recipe_or_index)
+        index = recipe_or_index.to_i
+        recipe = recipes[index]
+      else
+        recipe = recipe
+      end
+     run_generator(recipe)
+    end
 
-USAGE: kitty_gen add recipe_name
-MESSAGE
+    def run_generator(template)
+      Cook.new(template)
     end
 
-    def add(recipe)
-      recipe_location = File.join(kitty_gen_dir, "recipes", (recipe + "_recipe.rb"))
-      puts recipe_location
-      exec "rake rails:template LOCATION=#{recipe_location}"
+    def is_a_number?(parameter)
+      parameter.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true 
     end
 
     def master_template
@@ -50,5 +69,13 @@ MESSAGE
       File.dirname(__FILE__)
     end
 
+    def help
+%Q{Commands available: 
+          kitty_gen new APPNAME  # create a new app APPNAME using preffered recipes
+          kitty_gen list         # lists available recipes
+          kitty_gen add RECIPE   # adds a recipe RECIPE
+        }
+    end
+
   end
 end

data/lib/kitty_gen/cook.rb

@@ -0,0 +1,21 @@
+   require "rails/generators"
+   require "rails"
+   require 'rails/generators/rails/app/app_generator'
+   require "kitty_gen/helpers"
+module KittyGen
+ class Cook
+
+   require "rails/generators"
+   require "rails"
+   require 'rails/generators/rails/app/app_generator'
+   require "kitty_gen/helpers"
+
+   def initialize(template)
+      generator = Rails::Generators::AppGenerator.new [Dir.pwd], {}, :destination_root => Dir.pwd 
+      generator.extend(::KittyGen::Helpers)
+      generator.recipe template
+   end
+
+ end 
+
+end

data/lib/kitty_gen/{cooking_helpers.rb → helpers.rb}

@@ -3,7 +3,7 @@ require "thor"
 require "colored"
 module KittyGen
 
-  module CookingHelpers 
+  module Helpers 
     attr_accessor :current_recipe
 
     def introduce_yourself
@@ -16,7 +16,17 @@ module KittyGen
       end
     end
 
-    private
+    # Importantly, this runs each recipe
+    # in its own exclusive scope. This means
+    # symbols from one recipe cannot pollute
+    # the namespace
+    def recipe(thing_to_do)
+      thing_to_do = thing_to_do.to_s
+      self.current_recipe = thing_to_do
+      log_recipe_name thing_to_do
+      apply "#{thing_to_do}_recipe.rb" 
+      git_commit_with_message
+    end
 
     def tell_thor_where_your_files_will_go
       self.destination_root = Dir.pwd
@@ -26,13 +36,44 @@ module KittyGen
       self.source_paths << File.expand_path("../recipes/", __FILE__)
     end
 
+    private
+
+    def self.extended(base)
+      base.tell_thor_where_your_files_will_go
+      base.tell_those_where_you_keep_your_recipes
+    end
+
+    # Return hash of configuration optios locaed at
+    # ~/.kittygenrc
+    def kitty_gen_config
+      create_kittygenrc unless File.exist?(kittygenrc_location)
+      YAML.load(File.open(kittygenrc_location))
+    end
+
+    def create_kittygenrc
+        log_recipe_name("Installing a kittygenrc file in ~. This is where you store configurations global across all applications you generate")
+        thor_within_scope("kittygenrc") do
+          copy_file "kittygenrc", kittygenrc_location
+        end
+    end
+
+    def thor_within_scope(recipe, &thor_commands)
+      self.source_paths << File.expand_path("../templates/#{recipe}", __FILE__)
+      thor_commands.call
+      self.source_paths.pop
+    end
+
+    def kittygenrc_location
+      "#{Dir.home}/.kittygenrc"
+    end
+
     #this method places the template folder with the same name as the recipe in scope
     #before copying the file, the removes it again
     
     def copy_template(file_name, destination)
-      self.source_paths << File.expand_path("../templates/#{current_recipe}", __FILE__)
-      copy_file file_name, destination, :force => true
-      self.source_paths.pop
+      thor_within_scope(current_recipe) do
+        copy_file file_name, destination
+      end
     end
       
 
@@ -57,19 +98,7 @@ module KittyGen
 
     def git_commit_with_message 
       git :add => '.'
-      git :commit => "-m KittyGen added: #{current_recipe.humanize}"
-    end
-
-    # Importantly, this runs each recipe
-    # in its own exclusive scope. This means
-    # symbols from one recipe cannot pollute
-    # the namespace
-    def recipe(thing_to_do)
-      thing_to_do = thing_to_do.to_s
-      self.current_recipe = thing_to_do
-      log_recipe_name thing_to_do
-      apply "#{thing_to_do}_recipe.rb" 
-      # git_commit_with_message
+      git :commit => "-m 'KittyGen added: #{current_recipe.humanize}'"
     end
 
   end

data/lib/kitty_gen/master_template.rb

@@ -1,11 +1,6 @@
-require "kitty_gen/cooking_helpers"
-extend ::KittyGen::CookingHelpers
 #try getting cook to inherit from AppGenerator
-
 introduce_yourself
 #hack since thor expends an empty options hash
 # @options = {}
 app_name = ARGV.first
-tell_thor_where_your_files_will_go
-tell_those_where_you_keep_your_recipes
 prepare_standard_features

data/lib/kitty_gen/recipes/formtastic_recipe.rb

@@ -7,7 +7,6 @@ append_to_file "app/assets/stylesheets/application.css" do
   *= require my_formtastic_changes
   }
 end
-  
 create_file "app/assets/stylesheets/ie6.css" do 
   %Q{
   *= require formtastic_ie6

data/lib/kitty_gen/recipes/login_with_facebook_and_twitter_recipe.rb

@@ -1,16 +1,17 @@
 gem "omniauth"
-directory "app/controllers/users"
-copy_template "omniauth_callbacks_controller", "users/omniauth_callbacks_controller"
+empty_directory "app/controllers/users"
+copy_template "omniauth_callbacks_controller.rb", "app/controllers/users/omniauth_callbacks_controller.rb"
 
-inject_into_file "config/intializers/devise.rb", :before => 'end' <<-RUBY
+inject_into_file "config/initializers/devise.rb", :after => 'Devise.setup do |config|' do %Q{ 
   # For debugging start here: https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview
-  config.omniauth :facebook, "APP_ID", "APP_SECRET"
-RUBY
+  config.omniauth :facebook, "#{kitty_gen_config[:facebook_app_id]}", "#{kitty_gen_config[:facebook_app_secret]}"
+}
+end
 
-inject_into_file 'app/models/user.rb', :before => 'end' <<-RUBY
+inject_into_file 'app/models/user.rb', :before => 'end' do <<-RUBY
 
   devise :omniauthable
-   
+
   # Modify the user model to pass facebook email to devise if available
   def self.new_with_session(params, session)
     super.tap do |user|
@@ -20,12 +21,18 @@ inject_into_file 'app/models/user.rb', :before => 'end' <<-RUBY
     end
   end
 RUBY
+end
 
-gsub_file "config/routes.rb", "devise_for :users" <<-RUBY
+gsub_file "config/routes.rb", "devise_for :users" do <<-RUBY
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } do
     get '/users/auth/:provider' => 'users/omniauth_callbacks#passthru'
   end
 RUBY
+end
+
+inject_into_file "app/views/layouts/_login.html.slim", :after => "li = link_to 'Login', new_user_session_path" do
+  %Q{
+  li = link_to "Login with Facebook", user_omniauth_authorize_path(:facebook)
+  }
+end
 
-#layout
-# link_to "Sign in with Facebook", user_omniauth_authorize_path(:facebook)

data/lib/kitty_gen/templates/kittygenrc/kittygenrc

@@ -0,0 +1,2 @@
+facebook_app_secret: 123
+facebook_app_id: 345

data/lib/kitty_gen/version.rb

@@ -1,4 +1,4 @@
 module KittyGen 
-  VERSION = "0.0.16" #aka Beta
+  VERSION = "0.0.17" #aka Beta
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitty_gen
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153571480 !ruby/object:Gem::Requirement
+  requirement: &2157011160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2153571480
+  version_requirements: *2157011160
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2153571100 !ruby/object:Gem::Requirement
+  requirement: &2157010760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153571100
+  version_requirements: *2157010760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153570440 !ruby/object:Gem::Requirement
+  requirement: &2157010160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153570440
+  version_requirements: *2157010160
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153569920 !ruby/object:Gem::Requirement
+  requirement: &2157009740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153569920
+  version_requirements: *2157009740
 description: Save 5 hours starting your next project and use the latest and greatest
   best practices.
 email:
@@ -76,7 +76,9 @@ files:
 - lib/kitty_gen/base_recipes
 - lib/kitty_gen/cli.rb
 - lib/kitty_gen/configure/default.rb
-- lib/kitty_gen/cooking_helpers.rb
+- lib/kitty_gen/cook.rb
+- lib/kitty_gen/helpers.rb
+- lib/kitty_gen/kittens/kitty_1
 - lib/kitty_gen/master_template.rb
 - lib/kitty_gen/recipes/add_handy_application_wide_helpers_recipe.rb
 - lib/kitty_gen/recipes/basic_layout_with_login_using_slim_recipe.rb
@@ -101,6 +103,7 @@ files:
 - lib/kitty_gen/templates/basic_layout_with_login_using_slim/application.html.slim
 - lib/kitty_gen/templates/basic_layout_with_login_using_slim/layout.css.sass
 - lib/kitty_gen/templates/initialize_git_repo/gitignore
+- lib/kitty_gen/templates/kittygenrc/kittygenrc
 - lib/kitty_gen/templates/login_with_facebook_and_twitter/omniauth_callbacks_controller.rb
 - lib/kitty_gen/templates/postgresql
 - lib/kitty_gen/templates/setup_testing_with_capybara_testunit_and_watchr/test_unit.watchr