forge-cli 0.0.15 → 0.0.16

data/lib/forge-cli/app.rb

@@ -10,7 +10,7 @@ class ForgeCLI::App < Thor
     app = Dir.pwd
     modules = modules.split(',')
     modules.each do |mod|
-      ForgeCLI::ModuleInstaller.install_module!(mod, app)
+      ForgeCLI::ModuleInstaller.install_module!(mod, app, app)
     end
   end
 

data/lib/forge-cli/application_creator.rb

@@ -9,10 +9,11 @@ class ForgeCLI::ApplicationCreator
   end
 
   def create_application!
-    system("/usr/bin/env rails new #{@app}")
-    ForgeCLI::ModuleInstaller.install_module!(:base, @app)
+    system("/usr/bin/env rails new #{@app} --skip-bundle")
+    app_path = File.join(Dir.pwd, @app)
+    ForgeCLI::ModuleInstaller.install_module!(:base, @app, app_path)
     @modules.each do |mod|
-      ForgeCLI::ModuleInstaller.install_module!(mod, @app)
+      ForgeCLI::ModuleInstaller.install_module!(mod, @app, app_path)
     end
 
     # Remove some base Rails files that we don't want

data/lib/forge-cli/module_installer.rb

@@ -5,10 +5,11 @@ class ForgeCLI
       mi.run!
     end
 
-    def initialize(module_name, app)
+    def initialize(module_name, app, app_path)
       @module_name  = module_name.to_s
       @mod          = module_manifest
       @app          = app
+      @app_path     = app_path
     end
 
     def run!
@@ -104,10 +105,6 @@ class ForgeCLI
         @base_path ||= File.join(File.dirname(__FILE__), "..", "forge")
       end
 
-      def app_path
-        @app_path ||= File.join(Dir.pwd, @app)
-      end
-
       def module_manifest
         @module_manifest = YAML.load_file(File.join(File.dirname(__FILE__), 'modules', @module_name, 'manifest.yml'))
       end

data/lib/forge-cli/modules/base/post_hooks.rb

@@ -10,7 +10,7 @@ class ForgeCLI
     end
 
     def fix_gemfile
-      if RUBY_VERSION.match(/^1\.9/)
+      if RUBY_VERSION.to_f > 1.8
         gemfile_content = File.read(File.join(@app, 'Gemfile'))
         new_content = gemfile_content.gsub("gem 'capybara', '~> 2.0.0'", "gem 'capybara'")
         new_content = gemfile_content.gsub("gem 'shoulda-matchers', '~> 2.0.0'", "gem 'shoulda-matchers'")

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/lib/forge/app/controllers/comments_controller.rb

@@ -1,11 +1,7 @@
 class CommentsController < ApplicationController
   before_filter :get_archive_months, :only => :create
-  before_filter :get_post_categories, :only => :create  
-  # TODO: figure out a caching mechanism
-  # cache_sweeper :post_sweeper, :only => [:create, :destroy]
-  # TODO: rakismet back in
-  # has_rakismet :only => :create
-  
+  before_filter :get_post_categories, :only => :create
+
   def create
      params[:comment].merge!({:user_ip => request.remote_ip, :user_agent => request.env['HTTP_USER_AGENT'], :referrer => request.env['HTTP_REFERER']})
      @comment = Comment.new(params[:comment])

data/lib/forge/app/controllers/events_controller.rb

@@ -1,6 +1,4 @@
 class EventsController < ApplicationController
-  caches_page :index, :show
-
   if Forge.config.events.display == :calendar
     helper LaterDude::CalendarHelper
   end

data/lib/forge/app/controllers/forge/help_topics_controller.rb

@@ -1,7 +1,7 @@
 class Forge::HelpTopicsController < ForgeController
 
   def index
-    @help_topics = HelpTopic.order(:title).group(:title)
+    @help_topics = HelpTopic.order(:title).group(:title, :id)
     respond_to do |format|
       format.js { render :layout => false }
       format.html { }

data/lib/forge/app/controllers/forge/posts_controller.rb

@@ -1,7 +1,6 @@
 class Forge::PostsController < ForgeController
   before_filter :get_collections
   before_filter :uses_ckeditor, :only => [:new, :update, :create, :edit]
-  cache_sweeper :page_sweeper, :only => [:update, :create, :destroy]
   load_and_authorize_resource
 
   def index

data/lib/forge/app/controllers/posts_controller.rb

@@ -1,8 +1,6 @@
 class PostsController < ApplicationController
   before_filter :get_archive_months, :only => [:index, :category, :show]
   before_filter :get_post_categories
-  caches_page :show, :index, :category
-
   # TODO: re-enable caching
   # caches_page :index, :feed
 

data/lib/forge/config/application.rb

@@ -46,7 +46,6 @@ module Forge3
 
     config.autoload_paths += [
       File.join(Rails.root, 'lib'),
-      File.join(Rails.root, 'app', 'sweepers'),
       File.join(Rails.root, 'app', 'form_builders'),
       File.join(Rails.root, 'app', 'abilities')
     ]

data/lib/forge/lib/forge.rb

@@ -10,6 +10,6 @@ module Forge
 
   class Configuration
     attr_accessor :mobile_layout, :support_instructions_in_layout,
-                  :languages, :seo_callout
+                  :languages, :seo_callout, :support_instruction_in_help
   end
 end

metadata

@@ -1,118 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: forge-cli
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.0.16
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 15
-  version: 0.0.15
 platform: ruby
-authors: 
+authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-13 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 2
-        - 13
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rainbow
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: sean@factore.ca
-executables: 
+executables:
 - forge
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - bin/forge
 - lib/forge/app/abilities/video_ability.rb
 - lib/forge/app/assets/javascripts/app.js
@@ -1458,44 +1460,34 @@ files:
 - lib/forge-cli/version.rb
 - lib/forge-cli.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://factore.ca/forge-cms
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - forge-cli
 - --main
 - README.rdoc
 - -ri
-require_paths: 
+require_paths:
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: "Forge: A CMS for Rapid Application Development"
+summary: ! 'Forge: A CMS for Rapid Application Development'
 test_files: []
-