Fixed guard scroll causing engine yard deploy failure due to inconsistent gems between dev & prod

.gitignore

@@ -6,3 +6,5 @@ dist/*
 .idea
 .rvmrc
 .DS_Store
+local_scrolls
+scroll_config.rb

README.md

@@ -66,6 +66,28 @@ Or print out a list of scrolls for a specific category:
 
     scrolls list persistence
 
+### User Scrolls
+
+You can define an environment variable APPSCROLLS_DIR with a path to your local app scrolls:
+
+    export APPSCROLLS_DIR=~/.scrolls
+
+### Scroll Configuration
+
+If you wish to skip any configuration questions, you can provide the path to a configuration file with the `-c` or `--config` option:
+
+    scrolls new APP_NAME -c ~/.scrolls_config.rb
+
+This config file is a script that can provide defaults for scrolls by setting config.SCROLL_NAME.OPTION_NAME.  For example:
+```
+config.postgresql.pg_username = 'root'
+config.postgresql.pg_password = ''
+config.guard.guard_notifications = false
+```
+
+Or instead of passing a flag each time, just set the APPSCROLLS_CONFIG environment variable to include it every time:
+    export APPSCROLLS_CONFIG=~/.scrolls_config.rb
+
 ## Deployment Support
 
 Web applications are boring if they aren't running proudly on the internet. The App Scrolls make this automatic for your favourite providers!

Rakefile

@@ -20,7 +20,7 @@ task :run => :clean do
   require 'tempfile'
   require 'appscrolls'
 
-  template = AppScrollsScrolls::Template.new(scrolls)
+  template = AppScrolls::Template.new(scrolls)
 
   begin
     dir = Dir.mktmpdir "rails_template"
@@ -42,22 +42,22 @@ task :print do
   require 'appscrolls'
 
   scrolls = ENV['SCROLLS'].split(',')
-  puts AppScrollsScrolls::Template.new(scrolls).compile
+  puts AppScrolls::Template.new(scrolls).compile
 end
 
 namespace :list do
   desc "Display scrolls by category"
   task :categories do
     require 'appscrolls'
-    categories = AppScrollsScrolls::Scrolls.categories.sort
+    categories = AppScrolls::Scrolls.categories.sort
     categories = (categories - ["other"]) + ["other"]
     categories.each do |category|
-      puts "#{category}: #{AppScrollsScrolls::Scrolls.for(category).join(", ")}"
+      puts "#{category}: #{AppScrolls::Scrolls.for(category).join(", ")}"
     end
   end
 
   # desc "Display scrolls by exclusion"
   # task :exclusions do
   # 
   # end
-end
+end

appscrolls.gemspec

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + "/version"
 
 Gem::Specification.new do |s|
   s.name        = "appscrolls"
-  s.version     = AppScrollsScrolls::VERSION
+  s.version     = AppScrolls::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Michael Bleigh", "Dr Nic Williams"]
   s.email       = ["michael@intridea.com", "drnicwilliams@gmail.com"]

bin/appscrolls

@@ -4,4 +4,4 @@ $:.push File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
 require 'appscrolls/command'
 
-AppScrollsScrolls::Command.start
+AppScrolls::Command.start

bin/scroll

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$:.push File.dirname(__FILE__) + '/../lib'
+
+require 'rubygems'
+require 'appscrolls/command'
+
+AppScrolls::Command.start

bin/scrolls

@@ -4,4 +4,4 @@ $:.push File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
 require 'appscrolls/command'
 
-AppScrollsScrolls::Command.start
+AppScrolls::Command.start

lib/appscrolls.rb

@@ -3,8 +3,24 @@
 require 'appscrolls/config'
 require 'appscrolls/template'
 
-Dir[File.dirname(__FILE__) + '/../scrolls/*.rb'].each do |path|
+def enroll_scroll_at(path)
   key = File.basename(path, '.rb')
-  scroll = AppScrollsScrolls::Scroll.generate(key, File.open(path))
-  AppScrollsScrolls::Scrolls.add(scroll)
+  scroll_class_name = ActiveSupport::Inflector.camelize(key.gsub("-", "_"))
+
+  # default files of same keys as local scrolls are discarded
+  return if AppScrolls::Scrolls.const_defined?(scroll_class_name)
+
+  scroll = AppScrolls::Scroll.generate(key, File.open(path))
+  AppScrolls::Scrolls.add(scroll)
+end
+
+scroll_files = Dir[File.dirname(__FILE__) + '/../scrolls/*.rb']
+
+# set up local scrolls if available
+if dir = ENV['APPSCROLLS_DIR'] and dir != ""
+  scroll_files = Dir[dir+"/**{,/*/**}/*.rb"] + scroll_files
+end
+
+scroll_files.each do |path|
+  enroll_scroll_at(path)
 end

lib/appscrolls/command.rb

@@ -1,15 +1,24 @@
 require 'appscrolls'
 require 'thor'
+require File.dirname(__FILE__) + "/../../version"
 
-module AppScrollsScrolls
+module AppScrolls
   class Command < Thor
     include Thor::Actions
+
+    desc "version", "show version of currently installed AppScrolls gem"
+    def version
+      puts "AppScrolls version #{AppScrolls::VERSION} ready to make magic."
+    end
+
     desc "new APP_NAME", "create a new Rails app"
     method_option :scrolls, :type => :array, :aliases => "-s", :desc => "List scrolls, e.g. -s resque rails_basics jquery"
     method_option :template, :type => :boolean, :aliases => "-t", :desc => "Only display template that would be used"
+    method_option :config, :type => :string, :aliases => "-c", :desc => "Path to config script to run before scrolls"
     def new(name)
+      config_file = options[:config] || ENV['APPSCROLLS_CONFIG']
       if options[:scrolls]
-        run_template(name, options[:scrolls], options[:template])
+        run_template(name, options[:scrolls], :display_only => options[:template], :config_file => config_file)
       else
         @scrolls = []
 
@@ -19,7 +28,7 @@ def new(name)
             @scrolls.delete(scroll)
             puts
             puts "> #{yellow}Removed '#{scroll}' from template.#{clear}"
-          elsif AppScrollsScrolls::Scrolls.list.include?(scroll)
+          elsif AppScrolls::Scrolls.list.include?(scroll)
             @scrolls << scroll
             puts
             puts "> #{green}Added '#{scroll}' to template.#{clear}"
@@ -29,22 +38,36 @@ def new(name)
           end
         end
 
-        run_template(name, @scrolls)
+        run_template(name, @scrolls, :display_only => options[:template], :config_file => config_file)
       end
     end
 
     desc "list [CATEGORY]", "list available scrolls (optionally by category)"
     def list(category = nil)
       if category
-        scrolls = AppScrollsScrolls::Scrolls.for(category).map{|r| AppScrollsScrolls::Scroll.from_mongo(r) }
+        scrolls = AppScrolls::Scrolls.for(category).map{|r| AppScrolls::Scroll.from_mongo(r) }
       else
-        scrolls = AppScrollsScrolls::Scrolls.list_classes
+        scrolls = AppScrolls::Scrolls.list_classes
       end
 
       scrolls.each do |scroll|
         puts scroll.key.ljust(15) + "# #{scroll.description}"
       end
     end
+
+    desc "memorize NEW_SCROLL", "saves last git commit as a patch and creates scroll to apply it (alpha feature)"
+    def memorize(scroll_name)
+      scrolls_path = File.expand_path("../../../scrolls", __FILE__)
+      patch_file = scrolls_path + "/#{scroll_name}.diff"
+      scroll_file = scrolls_path + "/#{scroll_name}.rb"
+      @name = scroll_name
+      self.class.source_root File.expand_path("../../../templates", __FILE__)
+      self.class.attr_reader :name
+      template "diff_patch.tt", patch_file
+      template "memorized_scroll.tt", scroll_file
+      puts "Memorized #{scroll_name} into scroll diff patch #{scroll_name}.diff and scroll #{scroll_file}"
+      `open #{patch_file} #{scroll_file}`
+    end
 
     no_tasks do
       def cyan; "\033[36m" end
@@ -60,21 +83,23 @@ def scrolls_message
           message << "#{green}#{bold}Your Scrolls:#{clear} #{@scrolls.join(", ")}"
           message << "\n\n"
         end
-        available_scrolls = AppScrollsScrolls::Scrolls.list - @scrolls
+        available_scrolls = AppScrolls::Scrolls.list - @scrolls
         if available_scrolls.any?
           message << "#{bold}#{cyan}Available Scrolls:#{clear} #{available_scrolls.join(', ')}"
           message << "\n\n"
         end
         message
       end
 
-      def run_template(name, scrolls, display_only = false)
+      def run_template(name, scrolls, options = {})
         puts
         puts
         puts "#{bold}Generating and Running Template...#{clear}"
         puts
         file = Tempfile.new('template')
-        template = AppScrollsScrolls::Template.new(scrolls)
+        template_options = {}
+        template_options[:config_script] = File.read(options[:config_file]) if options[:config_file]
+        template = AppScrolls::Template.new(scrolls, template_options)
 
         puts "Using the following scrolls:"
         template.resolve_scrolls.map do |scroll|
@@ -85,14 +110,14 @@ def run_template(name, scrolls, display_only = false)
 
         file.write template.compile
         file.close
-        if display_only
+        if options[:display_only]
           puts "Template stored to #{file.path}"
           puts File.read(file.path)
         else
           system "rails new #{name} -m #{file.path} #{template.args.join(' ')}"
         end
       ensure
-        file.unlink
+        file.unlink unless options[:display_only]
       end
     end
   end

lib/appscrolls/config.rb

@@ -1,6 +1,6 @@
 require 'active_support/ordered_hash'
 
-module AppScrollsScrolls
+module AppScrolls
   class Config
     attr_reader :questions
 
@@ -18,7 +18,7 @@ def initialize(schema)
 
     def compile(values = {})
       result = []
-      result << "config = #{values.inspect}"
+      result << "config.merge! #{values.inspect}" unless values.empty?
       @questions.each_pair do |key, question|
         result << "config['#{key}'] = #{question.compile} unless config.key?('#{key}')"
       end
@@ -33,15 +33,16 @@ def initialize(details)
       end
 
       def compile
-        "#{question} if #{conditions}"
+        "#{question}#{conditions}"
       end
 
       def question
         "ask_wizard(#{prompt.inspect})"
       end
 
       def conditions
-        [config_conditions, scroll_conditions].join(' && ')
+        conditions_string = [config_conditions, scroll_conditions].reject{|v| v=='true'}.join(' && ')
+        " if " + conditions_string unless conditions_string.empty?
       end
 
       def config_conditions

lib/appscrolls/scroll.rb

@@ -4,7 +4,7 @@
 require 'yaml'
 require 'erb'
 
-module AppScrollsScrolls
+module AppScrolls
   class Scroll
     extend Comparable
 
@@ -38,7 +38,7 @@ def self.generate(key, template_or_file, attributes = {})
         template = template_or_file
       end
 
-      scroll_class = Class.new(AppScrollsScrolls::Scroll) 
+      scroll_class = Class.new(AppScrolls::Scroll) 
       scroll_class.attributes = attributes
       scroll_class.template = template
       scroll_class.key = key
@@ -72,16 +72,15 @@ def self.attributes=(hash)
     end
 
     def self.config
-      return nil unless attributes[:config]
-      AppScrollsScrolls::Config.new(attributes[:config])
+      AppScrolls::Config.new(attributes[:config]||[])
     end
 
     def attributes
       self.class.attributes
     end
 
     def self.compile
-      "# >#{"[ #{name} ]".center(75,'-')}<\n\n# #{description}\nsay_scroll '#{name}'\n\n#{template}\n"
+      "# >#{"[ #{name} ]".center(75,'-')}<\n\n# #{description}\nsay_scroll '#{name.gsub("'", "\\'")}'\n\n#{template}\n"
     end
     def compile; self.class.compile end
 
@@ -95,8 +94,8 @@ def self.to_mongo(value)
     end
 
     def self.from_mongo(key)
-      return key if key.respond_to?(:superclass) && key.superclass == AppScrollsScrolls::Scroll
-      AppScrollsScrolls::Scrolls[key]
+      return key if key.respond_to?(:superclass) && key.superclass == AppScrolls::Scroll
+      AppScrolls::Scrolls[key]
     end
 
     def self.get_binding

lib/appscrolls/scrolls.rb

@@ -1,10 +1,12 @@
-module AppScrollsScrolls
+module AppScrolls
   module Scrolls
     @@categories = {}
     @@list = {}
 
     def self.add(scroll)
-      AppScrollsScrolls::Scrolls.const_set ActiveSupport::Inflector.camelize(scroll.key.gsub("-", "_")), scroll
+      sym = ActiveSupport::Inflector.camelize(scroll.key.gsub("-", "_"))
+      return if AppScrolls::Scrolls.const_defined?(sym)
+      AppScrolls::Scrolls.const_set ActiveSupport::Inflector.camelize(scroll.key.gsub("-", "_")), scroll
       @@list[scroll.key] = scroll
       (@@categories[scroll.category.to_s] ||= []) << scroll.key
       @@categories[scroll.category.to_s].uniq!