figaro 0.1.1 → 0.2.0

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.DS_Store
 .bundle
 .config
 .rvmrc
@@ -9,6 +10,7 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+gemfiles/*.gemfile.lock
 lib/bundler/man
 pkg
 rdoc

data/.travis.yml

@@ -1,7 +1,11 @@
+branches: master
+gemfile:
+  - gemfiles/rails30.gemfile
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile
 language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ruby-head
-branches: master

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails30" do
+  gem "rails", "~> 3.0.0"
+end
+
+appraise "rails31" do
+  gem "rails", "~> 3.1.0"
+end
+
+appraise "rails32" do
+  gem "rails", "~> 3.2.0"
+end

data/README.md

@@ -28,17 +28,15 @@ Okay. Add Figaro to your bundle:
 gem "figaro"
 ```
 
-Next up, create your application's configuration file in `config/application.yml`:
-
-```yaml
-PUSHER_APP_ID: "2954"
-PUSHER_KEY: 7381a978f7dd7f9a1117
-PUSHER_SECRET: abdc3b896a0ffb85d373
-STRIPE_API_KEY: EdAvEPVEC3LuaTg5Q3z6WbDVqZlcBQ8Z
-STRIPE_PUBLIC_KEY: pk_BRgD57O8fHja9HxduJUszhef6jCyS
+Next up, install Figaro:
+
+```bash
+rails generate figaro:install
 ```
 
-Now, just add `config/application.yml` to your `.gitignore` and you're done! Your configuration will be available as key/value pairs in `ENV`. For example, here's `config/initializers/pusher.rb`:
+This generates a commented `config/application.yml` file and ignores it in your `.gitignore`. Add your own configuration to this file and you're done!
+
+Your configuration will be available as key/value pairs in `ENV`. For example, here's `config/initializers/pusher.rb`:
 
 ```ruby
 Pusher.app_id = ENV["PUSHER_APP_ID"]

data/Rakefile

@@ -2,6 +2,7 @@
 
 require "bundler/gem_tasks"
 require "cucumber/rake/task"
+require "appraisal"
 
 Cucumber::Rake::Task.new(:cucumber)
 

data/features/rails.feature

@@ -22,6 +22,21 @@ Feature: Rails
     And I run "bundle exec rake hello"
     Then the output should be "Hello!"
 
+  Scenario: Has blank application.yml
+    When I create "config/application.yml" with:
+      """
+      """
+    And I run "bundle exec rake hello"
+    Then the output should be "Hello!"
+
+  Scenario: Has commented application.yml
+    When I create "config/application.yml" with:
+      """
+      # Comment
+      """
+    And I run "bundle exec rake hello"
+    Then the output should be "Hello!"
+
   Scenario: Has application.yml with requested key
     When I create "config/application.yml" with:
       """
@@ -29,3 +44,14 @@ Feature: Rails
       """
     And I run "bundle exec rake hello"
     Then the output should be "Hello, world!"
+
+  Scenario: Generator creates and ignores application.yml file
+    When I run "bundle exec rails generate figaro:install"
+    Then "config/application.yml" should exist
+    And ".gitignore" should contain "/config/application.yml"
+
+  Scenario: Generator only creates application.yml if not using Git
+    Given I run "rm .gitignore"
+    When I run "bundle exec rails generate figaro:install"
+    Then "config/application.yml" should exist
+    But ".gitignore" should not exist

data/features/step_definitions/common_steps.rb

@@ -9,3 +9,11 @@ end
 Then /^the output should be "([^"]*)"$/ do |output|
   assert_exact_output(output, output_from(@commands.last).strip)
 end
+
+Then /^"([^"]+)" should ?(not)? exist$/ do |path, negative|
+  check_file_presence([path], !negative)
+end
+
+Then /^"([^"]+)" should contain "([^"]*)"$/ do |path, content|
+  check_file_content(path, content, true)
+end

data/features/step_definitions/rails_steps.rb

@@ -1,4 +1,5 @@
 Given "a new Rails app" do
-  run_simple("bundle exec rails new example --skip-bundle --skip-git --skip-active-record --skip-sprockets --skip-javascript --skip-test-unit")
+  in_current_dir{ FileUtils.rm_rf("example") }
+  run_simple("bundle exec rails new example --skip-bundle --skip-active-record --skip-sprockets --skip-javascript --skip-test-unit")
   cd("example")
 end

data/features/support/aruba.rb

@@ -4,5 +4,9 @@ require "aruba/cucumber/hooks"
 World(Aruba::Api)
 
 Before do
-  @aruba_timeout_seconds = 10
+  @aruba_timeout_seconds = 60
+end
+
+After "~@no-clobber" do
+  FileUtils.rm_rf(current_dir)
 end

data/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.1.1"
+  gem.version = "0.2.0"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]
@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rails", "~> 3.0"
 
+  gem.add_development_dependency "appraisal", "~> 0.4"
   gem.add_development_dependency "aruba", "~> 0.4"
   gem.add_development_dependency "cucumber", "~> 1.0"
   gem.add_development_dependency "rake", ">= 0.8.7"

data/gemfiles/rails30.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.0.0"
+
+gemspec :path=>"../"

data/gemfiles/rails31.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.0"
+
+gemspec :path=>"../"

data/lib/figaro/railtie.rb

@@ -5,7 +5,7 @@ module Figaro
   class Railtie < ::Rails::Railtie
     config.before_configuration do
       path = Rails.root.join("config/application.yml")
-      ENV.update(YAML.load_file(path)) if File.exist?(path)
+      ENV.update(YAML.load(File.read(path)) || {}) if File.exist?(path)
     end
   end
 end

data/lib/generators/figaro/install/install_generator.rb

@@ -0,0 +1,23 @@
+module Figaro
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_configuration
+        copy_file "application.yml", "config/application.yml"
+      end
+
+      def ignore_configuration
+        if File.exists?(".gitignore")
+          append_to_file ".gitignore" do
+            <<-EOF.strip_heredoc
+
+            # Ignore application configuration
+            /config/application.yml
+            EOF
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/figaro/install/templates/application.yml

@@ -0,0 +1,7 @@
+# Add application configuration variables here, as shown below.
+#
+# PUSHER_APP_ID: "2954"
+# PUSHER_KEY: 7381a978f7dd7f9a1117
+# PUSHER_SECRET: abdc3b896a0ffb85d373
+# STRIPE_API_KEY: EdAvEPVEC3LuaTg5Q3z6WbDVqZlcBQ8Z
+# STRIPE_PUBLIC_KEY: pk_BRgD57O8fHja9HxduJUszhef6jCyS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +101,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
@@ -96,8 +113,13 @@ files:
 - features/support/aruba.rb
 - features/support/env.rb
 - figaro.gemspec
+- gemfiles/rails30.gemfile
+- gemfiles/rails31.gemfile
+- gemfiles/rails32.gemfile
 - lib/figaro.rb
 - lib/figaro/railtie.rb
+- lib/generators/figaro/install/install_generator.rb
+- lib/generators/figaro/install/templates/application.yml
 homepage: https://github.com/laserlemon/figaro
 licenses: []
 post_install_message: