app_drone 0.10.0 → 0.11.0

data/README.md

@@ -269,6 +269,7 @@ AppDrone is not for everyone. It's highly opinionated about how a Rails app shou
 - [base] **Cleanup**
 - [base] **HighVoltage** by ThoughtBot
 - [base] **Flair** - drones use this to demonstrate their working functionality
+- [base] **Git** commit your repo, and allow drones to fetch external files via git
 - [views] **SimpleForm** with optional Country Select and automatic Twitter Bootstrap integration
 - [views] **NestedForm** for managing multiple models in a single form
 - [auth] **Sorcery** for no-frills user authentication
@@ -308,7 +309,6 @@ AppDrone is not for everyone. It's highly opinionated about how a Rails app shou
 - [test] Capybara
 - [test] Shoulda
 - [dev] Guard
-- [source-control] Git
 - [requests] InheritedResources (deprecated)
 - [requests] UserAgent blocking script
 - [mailing] SendGrid https://github.com/stephenb/sendgrid

data/lib/app_drone/drone.rb

@@ -62,6 +62,10 @@ class Drone
     @template.do! render(partial), self
   end
 
+  def do_finally!(partial)
+    @template.do_finally! render(partial), self
+  end
+
   # DSL: Integration-specific options
   attr_accessor :params
   class << self  

data/lib/app_drone/drones/git/cleanup.erb

@@ -0,0 +1 @@
+@generator.remove_dir '<%= tmp_path %>'

data/lib/app_drone/drones/git/commit.erb

@@ -0,0 +1,3 @@
+git :init
+git add: '.'
+git commit: "-m \"AppDrone: #{app_name}\""

data/lib/app_drone/drones/{zzz/git → git}/git.rb

@@ -3,6 +3,8 @@ class Git < Drone
   desc "Clone external resources into your app"
   category :base
 
+  param :commit, :boolean, info: 'Commit your repo once built'
+
   attr_accessor :fetches
 
   def tmp_path; 'git_tmp' end
@@ -15,10 +17,12 @@ class Git < Drone
 
   def execute
     do! :fetch
+    do_finally! :cleanup
+    do_finally! :commit if param(:commit)
   end
 
   def locate(p)
-    File.join '.', tmp_path, p
+    File.join tmp_path, p
   end
 
  private

data/lib/app_drone/drones/{zzz/html5_placeholder_shim → html5_placeholder_shim}/copy_to_assets.erb

@@ -2,4 +2,5 @@
 source = git.locate('jquery-html5-placeholder-shim/jquery.html5-placeholder-shim.js')
 dest = 'app/assets/javascripts/jquery.html5-placeholder-shim.js'
 %>
-@generator.copy_file '<%= source %>', '<%= dest %>'
+
+@generator.run 'cp <%= source %> <%= dest %>'

data/lib/app_drone/template.erb

@@ -17,9 +17,9 @@ class AppBuilder < Rails::AppBuilder
     # either way, this method is stupid.
   end
 
-<% overridden_generator_methods.each do |m| %>
+<% generator_methods.each do |m| %>
   def <%= m %>
-    super
+    <%= 'super' if overridden_generator_method?(m) %>
 <%= @directives[m].join("\n") %>
   end
 <% end %>
@@ -32,6 +32,9 @@ class AppBuilder < Rails::AppBuilder
     rake 'db:create'
     rake 'db:migrate'
 
+    <% if generator_methods.include?(:final) %>
+    final
+    <% end %>
 
     # Drone Notices
     <% drone_notices.each do |drone, notices| %>

data/lib/app_drone/template.rb

@@ -17,13 +17,19 @@ class Template
   end
   
   def leftover_directives; @directives[:leftovers] || [] end
-  def overridden_generator_methods; @directives.keys - [:leftovers] end
+  def generator_methods; @directives.keys - [:leftovers] end
+  def overridable_generator_methods; [:gemfile] end
+  def overridden_generator_method?(m); overridable_generator_methods.include?(m) end
 
   def do!(d,drone)
     generator_method = drone.class.generator_method || :leftovers
     (@directives[generator_method] ||= []) << d
   end
 
+  def do_finally!(d,drone)
+    (@directives[:final] ||= []) << d
+  end
+
   def notify!(notice,drone)
     (@drone_notices[drone.class] ||= []) << notice.gsub("'","\\'").gsub('"','\\"') # escape quotes
   end

data/lib/app_drone/version.rb

@@ -1,3 +1,3 @@
 module AppDrone
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/out.rb

@@ -35,6 +35,15 @@ run_bundle
 
   end
 
+  def final
+    
+# --- 
+# AppDrone::Git
+# ---
+@generator.remove_dir 'git_tmp'
+
+  end
+
 
   def leftovers
 
@@ -127,13 +136,17 @@ FLAIR
 # AppDrone::Html5PlaceholderShim
 # ---
 
-@generator.copy_file './git_tmp/jquery-html5-placeholder-shim/jquery.html5-placeholder-shim.js', 'app/assets/javascripts/jquery.html5-placeholder-shim.js'
+
+@generator.run 'cp git_tmp/jquery-html5-placeholder-shim/jquery.html5-placeholder-shim.js app/assets/javascripts/jquery.html5-placeholder-shim.js'
 
 
     # This should be removed when the database drone is installed
     rake 'db:create'
     rake 'db:migrate'
 
+    
+    final
+    
 
     # Drone Notices
     

data/test/test_app_drone.rb

@@ -17,14 +17,14 @@ class AppDroneTest < Test::Unit::TestCase
 
   def test_dependants
     d = AppDrone::Bundle.dependants
-    puts AppDrone::Drone.drones
+    drones = AppDrone::Drone.drones
   end
 
   def test_basic_behavior
     template = Template.new
     add_defaults_to_template(template)
 
-    template.add :git
+    template.add :git, commit: false
     template.add :html5_placeholder_shim
 
     template.render_to_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_drone
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &13619840 !ruby/object:Gem::Requirement
+  requirement: &18392420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *13619840
+  version_requirements: *18392420
 description: Give your Rails apps a kickstart
 email:
 - whoisdanieldavey@gmail.com
@@ -59,12 +59,18 @@ files:
 - lib/app_drone/drones/factory_girl/factory_girl.rb
 - lib/app_drone/drones/flair/flair.rb
 - lib/app_drone/drones/flair/flair_page.erb
+- lib/app_drone/drones/git/cleanup.erb
+- lib/app_drone/drones/git/commit.erb
+- lib/app_drone/drones/git/fetch.erb
+- lib/app_drone/drones/git/git.rb
 - lib/app_drone/drones/gritter/flair.html.slim.erb
 - lib/app_drone/drones/gritter/gritter.rb
 - lib/app_drone/drones/gritter/install.erb
 - lib/app_drone/drones/has_scope/has_scope.rb
 - lib/app_drone/drones/high_voltage/create_pages_directory.erb
 - lib/app_drone/drones/high_voltage/high_voltage.rb
+- lib/app_drone/drones/html5_placeholder_shim/copy_to_assets.erb
+- lib/app_drone/drones/html5_placeholder_shim/html5_placeholder_shim.rb
 - lib/app_drone/drones/javascript/application_coffee.erb
 - lib/app_drone/drones/javascript/javascript.rb
 - lib/app_drone/drones/letter_opener/development_delivery_method.erb
@@ -100,12 +106,7 @@ files:
 - lib/app_drone/drones/whenever/whenever.rb
 - lib/app_drone/drones/whenever/wheneverize.erb
 - lib/app_drone/drones/will_paginate/will_paginate.rb
-- lib/app_drone/drones/zzz/git/fetch.erb
-- lib/app_drone/drones/zzz/git/git.rb
-- lib/app_drone/drones/zzz/git/install.erb
 - lib/app_drone/drones/zzz/guard/guard.rb
-- lib/app_drone/drones/zzz/html5_placeholder_shim/copy_to_assets.erb
-- lib/app_drone/drones/zzz/html5_placeholder_shim/html5_placeholder_shim.rb
 - lib/app_drone/drones/zzz/rspec/install.erb
 - lib/app_drone/drones/zzz/rspec/rspec.rb
 - lib/app_drone/object_extensions.rb

data/lib/app_drone/drones/zzz/git/install.erb

@@ -1,3 +0,0 @@
-git :init
-git add: '.'
-git commit: "-m \"AppBuilder: #{app_name}\""