fastball 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705aaa59d0ae67092c18485e8c5a218d1658db10
-  data.tar.gz: 96d7d30bd753638c8ee846b0e7b18e39ae170057
+  metadata.gz: fd8af3009bb223137705487f6484cd31b161e330
+  data.tar.gz: 199da7aae7218bb70af11db334cf4b86feb4cb56
 SHA512:
-  metadata.gz: 2c91b291b3d3bf04676192761bf830b6030ac9e80cdd331b3e4156b62937d752889a71706fcfae0b6d6fe7c51ab9da23f96e75dcd12065535af8efcdc4d4f607
-  data.tar.gz: b8715b22588e5749d38d89ad153336bd31ffe30b612a1d3a0006d5e3ed890a31328f6919f48440cd70bd770bf9c2f9b5073e1611f3ec2510c31efa75143f1e5e
+  metadata.gz: a48a3c4532bb5176cd3c7aafe802a2a4956c109c71849d0825898148a8846b6fef0c4efcb3af3e021d060244cccabbcda6c687ce682b4e4e1b32c39eb61950db
+  data.tar.gz: bb7e9925e4869c0167a8dd05a033fdad55de24f61a1196341937cd1565e2988674b4ddb7aa75c9b1f977a4a79b2524c7e262307f65461699d5281fec8bb0f314

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/jbgo/fastball.svg?branch=master)](https://travis-ci.org/jbgo/fastball)
+
 # Fastball
 
 The safest, fastest way to build and deploy dynamic applications.
@@ -35,8 +37,8 @@ rake fastball:config  # generate environment specific configuration files
 
 ## Documentation
 
-See {Fastball::Config} for documentation and examples of using
-Fastball to generate config files.
+See [Fastball::Config](http://www.rubydoc.info/github/jbgo/fastball/master/Fastball/Config)
+for documentation and examples of using Fastball to generate config files.
 
 ## Roadmap
 
@@ -54,7 +56,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fastball.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jbgo/fastball.
 
 
 ## License

data/lib/fastball/config.rb

@@ -1,11 +1,19 @@
 require 'erb'
 require 'forwardable'
+require 'json'
 require 'yaml'
 
 module Fastball
 
   # The Fastball::Config generates environment specific configuration files.
   #
+  # == usage
+  #
+  # Set up your application's configuration templates and +app_config.yml+ file
+  # as described below, then run the following rake task:
+  #
+  #     `rake fastball:config`
+  #
   # == Conventions
   #
   # Fastball looks for ERB configuration templates in the following locations
@@ -54,7 +62,7 @@ module Fastball
   #
   #     !!!yaml
   #     ---
-  #     <%= staging %>:
+  #     <%= rails_env %>:
   #       adapter: mysql2
   #       host: <%= db.host %>
   #       username: <%= db.username %>
@@ -64,6 +72,7 @@ module Fastball
   #
   #     !!!yaml
   #     ---
+  #     rails_env: staging
   #     db:
   #       host: localhost
   #       username: dbuser
@@ -104,9 +113,17 @@ module Fastball
     end
 
     def load_config_values
-      @config ||= HashDot.new YAML.load(File.read('app_config.yml'))
-    rescue
-      raise MissingAppConfig.new("expecting app_config.yml to exist in the current directory")
+      @config ||= HashDot.new load_config_hash
+    end
+
+    def load_config_hash
+      if File.exists?('app_config.yml')
+        YAML.load File.read('app_config.yml')
+      elsif File.exists?('app_config.json')
+        JSON.parse File.read('app_config.json')
+      else
+        raise MissingAppConfig.new("expecting app_config.yml to exist in the current directory")
+      end
     end
 
     def render_template(path)

data/lib/fastball/version.rb

@@ -1,3 +1,3 @@
 module Fastball
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastball
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jordan Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,3 +117,4 @@ signing_key:
 specification_version: 4
 summary: The safest, fastest way to build and deploy dynamic applications.
 test_files: []
+has_rdoc: