sandro-homeward 0.1.2 → 0.2.0

data/History.txt

@@ -1,3 +1,13 @@
+== 0.2.0 / 2009-06-01
+* 2 major enhancements
+  - Removed many methods in the Homeward namespace - Homeward is now simply a generator.
+  - Generated rake file loads its rake tasks from the gem
+
+* 3 minor enhancements
+  - APP_CONFIG is now APP_SETTINGS
+  - Running the Blueprint rake tasks clones the repo into /tmp unless its already present
+  - Jrails is installed from github
+
 == 0.1.1 / 2009-01-12
 * 2 major enhancements
   - Providing a mechanism for creating application specific settings via config/settings.yml. Access your settings via the APP_CONFIG constant

data/README.rdoc

@@ -16,7 +16,7 @@ Rakefile and generators to help create my baseapp
 * Defines render_flashes which will render a flash message when available, utilized by the layout
 * Defines current_page helper to be used with will\_paginate
 
-    rake homeward
+    rake homeward:install
         Update and install Blueprint, replace prototype with jrails
 
     rake homeward:blueprint:install
@@ -42,10 +42,9 @@ Rakefile and generators to help create my baseapp
 
 == INSTALL:
 
-  1. config.gem 'sandro-homeward', :lib => 'homeward', :source => 'http://gems.github.com'
-  2. Edit the BLUEPRINT_GIT_PATH constant in lib/tasks/homeward.rake
-  3. script/generate homeward
-  4. rake homeward
+  1. gem install sandro-homeward
+  2. script/generate homeward
+  3. rake homeward:install
 
 == LICENSE:
 

data/lib/homeward.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module Homeward
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 
@@ -17,37 +17,13 @@ module Homeward
     args.empty? ? PATH : ::File.join(PATH, args.flatten)
   end
 
-  def self.require_all_libs_relative_to( fname, dir = nil )
+  def self.require_all_libs_relative_to(fname, dir = nil)
     dir ||= ::File.basename(fname, '.*')
     search_me = ::File.expand_path(
         ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
 
     Dir.glob(search_me).sort.each {|rb| require rb}
   end
-
-  def self.define_method_unless_defined(klass, method_name, &block)
-    unless klass.method_defined?(method_name)
-      klass.send(:define_method, method_name, block)
-    end
-  end
-
-  def self.load_app_config
-    returning HashWithIndifferentAccess.new do |app_config|
-      config_file_path = File.join(RAILS_ROOT, %w(config settings.yml))
-      if File.exist?(config_file_path)
-        config = YAML.load_file(config_file_path)
-        app_config.merge!(config[Rails.env]) if config.has_key?(Rails.env)
-      else
-        puts "WARNING: configuration file #{config_file_path} not found."
-      end
-    end
-  end
 end
 
 Homeward.require_all_libs_relative_to(__FILE__)
-
-if Object.const_defined?(:Rails)
-  ActionView::Base.send(:include, Homeward::ViewHelpers)
-  ActionController::Base.send(:include, Homeward::ControllerHelpers)
-end
-

data/lib/tasks/homeward.rake

@@ -0,0 +1,54 @@
+require 'fileutils'
+require 'open3'
+
+BLUEPRINT_CLONE_URL = "git://github.com/joshuaclayton/blueprint-css.git"
+BLUEPRINT_PATH = "/tmp/blueprint-css"
+
+namespace :homeward do
+  desc %q(Update and install Blueprint, replace prototype with jrails)
+  task :install => %w(homeward:blueprint:update homeward:blueprint:install homeward:javascript:use_jrails)
+
+  namespace :blueprint do
+    task :clone do
+      unless File.exists?(BLUEPRINT_PATH)
+        puts %x(git clone #{BLUEPRINT_CLONE_URL} #{BLUEPRINT_PATH})
+      end
+    end
+
+    desc 'pulls the latest blueprint code'
+    task :update => :clone do
+      Dir.chdir BLUEPRINT_PATH do
+        Open3.popen3("git stash && git pull && git pop") do |stdin, stdout, stderr|
+          puts stdout.readlines.last
+        end
+      end
+    end
+
+    desc "installs blueprint"
+    task :install => :clone do
+      compressor = "#{BLUEPRINT_PATH}/lib/compress.rb"
+      install_path = "#{Rails.root}/public/stylesheets/blueprint"
+      %x(ruby #{compressor} -o #{install_path})
+      FileUtils.rm_rf "#{install_path}/src"
+    end
+  end
+
+  namespace :javascript do
+    desc 'replaces prototype with jrails'
+    task :use_jrails => [:remove_prototype, :install_jrails]
+
+    desc 'removes prototype'
+    task :remove_prototype do
+      Dir.chdir("#{Rails.root}/public/javascripts") do
+        FileUtils.rm_rf %w(prototype.js effects.js dragdrop.js controls.js)
+      end
+    end
+
+    desc 'installs jrails'
+    task :install_jrails do
+      Dir.chdir(Rails.root) do
+        puts %x(script/plugin install git://github.com/aaronchi/jrails.git)
+      end
+    end
+  end
+end

data/{generators → rails_generators}/homeward/USAGE

@@ -1,5 +1,4 @@
 Description:
   Adds the homeward rake task to lib/tasks/homeward.rake
   Copies the homeward application layout to app/views/layouts/application.html.haml
-  Creates application wide settings adding settings.yml to config/
-
+  Creates application wide settings in config/settings.yml

data/{generators → rails_generators}/homeward/homeward_generator.rb

@@ -10,13 +10,18 @@ class HomewardGenerator < Rails::Generator::Base
     record do |m|
       m.directory 'lib/tasks'
       m.directory 'config/initializers'
+      m.directory 'app/helpers'
       m.directory 'app/views/layouts'
 
       m.with_options :collision => :ask do |mc|
         mc.file 'homeward.rake', 'lib/tasks/homeward.rake'
 
         mc.template 'application.html.haml', 'app/views/layouts/application.html.haml'
-        mc.template 'constants.rb', 'config/initializers/constants.rb'
+
+        mc.template 'application_settings.rb', 'config/initializers/application_settings.rb'
+        mc.template 'current_page_normalizer.rb', 'config/initializers/current_page_normalizer.rb'
+        mc.template 'homeward_helper.rb', 'app/helpers/homeward_helper.rb'
+
         mc.template 'settings.yml', 'config/settings.yml'
         mc.template 'settings.yml', 'config/settings.yml.example'
       end

data/{generators → rails_generators}/homeward/templates/application.html.haml

@@ -3,7 +3,7 @@
   %head
     %meta{"http-equiv" => 'Content-Type', :content => 'text/html;charset=utf-8'}
     %title= h(@title || "<%= project_name %>")
-    = blueprint_includes
+    = blueprint_stylesheets
     = stylesheet_link_tag 'application', :media => 'screen, projection'
     = javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.to_json};" if protect_against_forgery?
     = javascript_include_tag %w(jquery jquery-ui jrails)

data/rails_generators/homeward/templates/application_settings.rb

@@ -0,0 +1,13 @@
+def load_app_settings
+  returning HashWithIndifferentAccess.new do |app_settings|
+    config_file_path = File.join(RAILS_ROOT, %w(config settings.yml))
+    if File.exist?(config_file_path)
+      config = YAML.load_file(config_file_path)
+      app_settings.merge!(config[Rails.env]) if config[Rails.env]
+    else
+      puts "WARNING: configuration file #{config_file_path} not found."
+    end
+  end
+end
+
+APP_SETTINGS = load_app_settings

data/rails_generators/homeward/templates/current_page_normalizer.rb

@@ -0,0 +1,7 @@
+ActionController::Base.class_eval do
+  private
+
+  def current_page
+    params[:page].to_i < 1 ? 1 : params[:page].to_i
+  end
+end

data/rails_generators/homeward/templates/homeward.rake

@@ -0,0 +1,5 @@
+begin
+  load 'homeward/lib/tasks/homeward.rake'
+rescue LoadError
+  puts "Could not find the homeward raketask, did you install the 'sandro-homeward' gem?"
+end

data/rails_generators/homeward/templates/homeward_helper.rb

@@ -0,0 +1,17 @@
+module HomewardHelper
+  def blueprint_stylesheets
+    %(
+    #{stylesheet_link_tag 'blueprint/screen', :media => 'screen, projection'}
+    #{stylesheet_link_tag 'blueprint/print', :media => 'print'}
+    <!--[if IE]>
+     #{stylesheet_link_tag 'blueprint/ie', :media => 'screen, projection'}
+    <![endif]-->
+    )
+  end
+
+  def render_flashes
+    flash.map do |type, value|
+      content_tag('div', value, :id => "flash_#{type}")
+    end.join("\n")
+  end
+end

data/rails_generators/homeward/templates/settings.yml

@@ -0,0 +1,11 @@
+globals: &globals
+  project_name: <%= project_name %>
+
+development:
+  <<: *globals
+
+test:
+  <<: *globals
+
+production:
+  <<: *globals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sandro-homeward
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -21,23 +21,26 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- Manifest.txt
 - README.rdoc
+- lib/tasks/homeward.rake
 files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- generators/homeward/USAGE
-- generators/homeward/homeward_generator.rb
-- generators/homeward/templates/application.html.haml
-- generators/homeward/templates/constants.rb
-- generators/homeward/templates/homeward.rake
-- generators/homeward/templates/settings.yml
 - init.rb
 - lib/homeward.rb
-- lib/homeward/controller_helpers.rb
-- lib/homeward/view_helpers.rb
+- lib/tasks/homeward.rake
 - rails/init.rb
+- rails_generators/homeward/USAGE
+- rails_generators/homeward/homeward_generator.rb
+- rails_generators/homeward/templates/application.html.haml
+- rails_generators/homeward/templates/application_settings.rb
+- rails_generators/homeward/templates/current_page_normalizer.rb
+- rails_generators/homeward/templates/homeward.rake
+- rails_generators/homeward/templates/homeward_helper.rb
+- rails_generators/homeward/templates/settings.yml
 - spec/homeward_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/generators/homeward/templates/constants.rb

@@ -1,6 +0,0 @@
-DO_NOT_REPLY = "donotreply@example.com"
-PROJECT_NAME = "<%= project_name %>"
-HOST = "localhost"
-
-APP_CONFIG = Homeward.load_app_config
-

data/generators/homeward/templates/homeward.rake

@@ -1,51 +0,0 @@
-require 'fileutils'
-
-BLUEPRINT_GIT_PATH = "#{ENV['HOME']}/Code/Css/blueprint-css"
-
-desc %q(Update and install Blueprint, replace prototype with jrails)
-task :homeward => %w(homeward:blueprint:update homeward:blueprint:install homeward:javascript:use_jrails)
-
-namespace :homeward do
-  namespace :blueprint do
-    desc 'pulls the latest blueprint code'
-    task :update do
-      Dir.chdir BLUEPRINT_GIT_PATH do
-        puts %x(echo "Stashing\n" &&
-                git stash &&
-                echo "\nPulling\n" &&
-                git pull &&
-                echo "\nPopping\n" &&
-                git stash pop
-               )
-      end
-    end
-
-    desc "installs blueprint"
-    task :install do
-      compressor = "#{BLUEPRINT_GIT_PATH}/lib/compress.rb"
-      install_path = "#{Rails.root}/public/stylesheets/blueprint"
-      %x(ruby #{compressor} -o #{install_path})
-      FileUtils.rm_rf "#{install_path}/src"
-    end
-  end
-
-  namespace :javascript do
-    desc 'replaces prototype with jrails'
-    task :use_jrails => [:remove_prototype, :install_jrails]
-
-    desc 'removes prototype'
-    task :remove_prototype do
-      Dir.chdir("#{Rails.root}/public/javascripts") do
-        FileUtils.rm_rf %w(prototype.js effects.js dragdrop.js controls.js)
-      end
-    end
-
-    desc 'installs jrails'
-    task :install_jrails do
-      Dir.chdir(Rails.root) do
-        puts %x(script/plugin install http://ennerchi.googlecode.com/svn/trunk/plugins/jrails)
-      end
-    end
-  end
-end
-

data/generators/homeward/templates/settings.yml

@@ -1,14 +0,0 @@
-base_settings: &base_settings
-  :todo: development
-
-development:
-  <<: *base_settings
-
-test:
-  <<: *base_settings
-  :todo: test
-
-production:
-  <<: *base_settings
-  :todo: production
-

data/lib/homeward/controller_helpers.rb

@@ -1,10 +0,0 @@
-module Homeward
-  module ControllerHelpers
-    protected
-
-    def current_page
-      params[:page].to_i < 1 ? 1 : params[:page].to_i
-    end
-  end
-end
-

data/lib/homeward/view_helpers.rb

@@ -1,20 +0,0 @@
-module Homeward
-  module ViewHelpers
-    def blueprint_includes
-      %q(
-      <link rel="stylesheet" href="/stylesheets/blueprint/screen.css" type="text/css" media="screen, projection">
-      <link rel="stylesheet" href="/stylesheets/blueprint/print.css" type="text/css" media="print">
-      <!--[if IE]>
-        <link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection">
-      <![endif]-->
-      )
-    end
-
-    def render_flashes
-      flash.map do |type, value|
-        content_tag('div', value, :id => "flash_#{type}")
-      end.join("\n")
-    end
-  end
-end
-