forge 0.0.2 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+== 0.1.1 ==
+- LiveReload support
+- Option for "template" in config, for child themes
+- Additions and corrections to config template

data/Gemfile

@@ -12,6 +12,7 @@ gem "sass", "~> 3.1.8"
 gem "sprockets-sass", "~> 0.3.0"
 gem "compass", "~> 0.11.5"
 gem 'rack', '1.3.3'
+gem "guard-livereload", "~> 0.3.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     aruba (0.4.6)
       bcat (>= 0.6.1)
       childprocess (>= 0.2.0)
@@ -24,6 +25,10 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
+    em-websocket (0.3.1)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    eventmachine (0.12.10)
     ffi (1.0.9)
     fssm (0.2.7)
     gherkin (2.5.1)
@@ -31,12 +36,17 @@ GEM
     git (1.2.5)
     guard (0.8.4)
       thor (~> 0.14.6)
+    guard-livereload (0.3.1)
+      em-websocket (>= 0.2.0)
+      guard (>= 0.4.0)
+      multi_json (~> 1.0.3)
     hike (1.2.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.6.1)
+    multi_json (1.0.3)
     rack (1.3.3)
     rake (0.9.2)
     rcov (0.9.10)
@@ -54,7 +64,7 @@ GEM
     sprockets (2.0.2)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sprockets-sass (0.3.0)
       sprockets (~> 2.0)
     term-ansicolor (1.0.6)
@@ -70,6 +80,7 @@ DEPENDENCIES
   compass (~> 0.11.5)
   cucumber
   guard (~> 0.8.4)
+  guard-livereload (~> 0.3.1)
   jeweler (~> 1.6.4)
   json (~> 1.6.1)
   rack (= 1.3.3)

data/README.md

@@ -6,7 +6,7 @@
 
 -----
 
-Current Version: **0.0.2**
+Current Version: **0.1.1**
 
 Install Forge (requires [Ruby](http://www.ruby-lang.org/) and [RubyGems](http://rubygems.org/)):
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.1

data/forge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forge"
-  s.version = "0.0.2"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Adams", "Drew Strojny", "Matt Button"]
-  s.date = "2011-10-07"
+  s.date = "2011-10-21"
   s.description = "A toolkit for bootstrapping and developing WordPress themes."
   s.email = "aadams@jestro.com"
   s.executables = ["forge"]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     ".document",
     ".gitmodules",
     ".rspec",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -28,8 +29,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/forge",
-    "features/create.feature",
-    "features/link.feature",
     "features/step_definitions/forge_steps.rb",
     "features/support/env.rb",
     "forge.gemspec",
@@ -73,7 +72,6 @@ Gem::Specification.new do |s|
     "lib/guard/forge/config.rb",
     "lib/guard/forge/functions.rb",
     "lib/guard/forge/templates.rb",
-    "pkg/forge-0.0.2.gem",
     "spec/lib/forge/config_spec.rb",
     "spec/lib/forge/project_spec.rb",
     "spec/spec_helper.rb"
@@ -97,6 +95,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sprockets-sass>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<compass>, ["~> 0.11.5"])
       s.add_runtime_dependency(%q<rack>, ["= 1.3.3"])
+      s.add_runtime_dependency(%q<guard-livereload>, ["~> 0.3.1"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
@@ -113,6 +112,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sprockets-sass>, ["~> 0.3.0"])
       s.add_dependency(%q<compass>, ["~> 0.11.5"])
       s.add_dependency(%q<rack>, ["= 1.3.3"])
+      s.add_dependency(%q<guard-livereload>, ["~> 0.3.1"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
@@ -130,6 +130,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sprockets-sass>, ["~> 0.3.0"])
     s.add_dependency(%q<compass>, ["~> 0.11.5"])
     s.add_dependency(%q<rack>, ["= 1.3.3"])
+    s.add_dependency(%q<guard-livereload>, ["~> 0.3.1"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])

data/layouts/config/config.json.erb

@@ -14,13 +14,13 @@
   // Description of the theme
   "description": "<%= config[:description] %>",
 
-  // Description of the theme
+  // Version number of the theme
   "version_number": "<%= config[:version_number] %>",
 
-  // Description of the theme
+  // Name of the theme license
   "license_name": "<%= config[:license_name] %>",
 
-  // Description of the theme
+  // Website for the theme license
   "license_uri": "<%= config[:license_uri] %>",
 
   // Tags for this theme, as an array
@@ -29,5 +29,8 @@
   "tags": <%= config[:tags] ? config[:tags] : "[]" %>,
 
   // Additional comments (optional)
-  "comments": "<%= config[:comments] %>"
+  "comments": "<%= config[:comments] %>",
+
+  // Enable livereload gem
+  "live_reload": false
 }

data/layouts/config/stylesheet_header.erb

@@ -5,6 +5,9 @@
  * Author URI: <%= config["author_uri"] %>
  * Description: <%= config["description"] if config["description"] %>
  * Version: <%= config["version_number"] if config["version_number"] %>
+<% if config["template"] -%>
+ * Template: <%= config["template"] %>
+<% end -%>
  * License: <%= config["license_name"] if config["license_name"] %>
  * License URI: <%= config["license_uri"] if config["license_uri"] %>
  * Tags: <%= config["tags"].join(", ") if config["tags"] %>

data/lib/forge/guard.rb

@@ -46,6 +46,14 @@ module Forge
         end
       }
 
+      if @project.config['live_reload']
+        guardfile_contents << %Q{
+          guard 'livereload' do
+            watch(%r{#{source_path}/*})
+          end
+        }
+      end
+
       (@additional_guards || []).each do |block|
         result = block.call(options, livereload)
         guardfile_contents << result unless result.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000 Z
+date: 2011-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152342800 !ruby/object:Gem::Requirement
+  requirement: &2156012580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152342800
+  version_requirements: *2156012580
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152341300 !ruby/object:Gem::Requirement
+  requirement: &2156011940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152341300
+  version_requirements: *2156011940
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2152339320 !ruby/object:Gem::Requirement
+  requirement: &2156011360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152339320
+  version_requirements: *2156011360
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2152338580 !ruby/object:Gem::Requirement
+  requirement: &2156010820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152338580
+  version_requirements: *2156010820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152337340 !ruby/object:Gem::Requirement
+  requirement: &2156010140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152337340
+  version_requirements: *2156010140
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152336200 !ruby/object:Gem::Requirement
+  requirement: &2156009480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 3.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152336200
+  version_requirements: *2156009480
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &2152335320 !ruby/object:Gem::Requirement
+  requirement: &2156008880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152335320
+  version_requirements: *2156008880
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2152334400 !ruby/object:Gem::Requirement
+  requirement: &2156008300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152334400
+  version_requirements: *2156008300
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152333480 !ruby/object:Gem::Requirement
+  requirement: &2156007700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -111,10 +111,21 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152333480
+  version_requirements: *2156007700
+- !ruby/object:Gem::Dependency
+  name: guard-livereload
+  requirement: &2156006880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156006880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152332700 !ruby/object:Gem::Requirement
+  requirement: &2156006160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152332700
+  version_requirements: *2156006160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152332040 !ruby/object:Gem::Requirement
+  requirement: &2156005360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152332040
+  version_requirements: *2156005360
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152330140 !ruby/object:Gem::Requirement
+  requirement: &2156004240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152330140
+  version_requirements: *2156004240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152329320 !ruby/object:Gem::Requirement
+  requirement: &2156003640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +166,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152329320
+  version_requirements: *2156003640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152328260 !ruby/object:Gem::Requirement
+  requirement: &2155985080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,10 +177,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152328260
+  version_requirements: *2155985080
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152327260 !ruby/object:Gem::Requirement
+  requirement: &2155984220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,7 +188,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152327260
+  version_requirements: *2155984220
 description: A toolkit for bootstrapping and developing WordPress themes.
 email: aadams@jestro.com
 executables:
@@ -190,6 +201,7 @@ files:
 - .document
 - .gitmodules
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -197,8 +209,6 @@ files:
 - Rakefile
 - VERSION
 - bin/forge
-- features/create.feature
-- features/link.feature
 - features/step_definitions/forge_steps.rb
 - features/support/env.rb
 - forge.gemspec
@@ -242,7 +252,6 @@ files:
 - lib/guard/forge/config.rb
 - lib/guard/forge/functions.rb
 - lib/guard/forge/templates.rb
-- pkg/forge-0.0.2.gem
 - spec/lib/forge/config_spec.rb
 - spec/lib/forge/project_spec.rb
 - spec/spec_helper.rb
@@ -259,9 +268,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4281416040129770689
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/features/create.feature

@@ -1,34 +0,0 @@
-Feature: Initialize a new Forge project
-
-  Scenario: Creating a brand new project with all arguments
-    Given a WordPress installation exists at "wordpress"
-    When I successfully run `forge create foo --wp_dir=wordpress --name=foo_theme --uri=http://www.footheme.com --author="Foo Man" --author_uri=http://www.fooman.com`
-    Then the forge skeleton should be created in directory "foo"
-    And the file "foo/config.json" should contain:
-      | "name": "foo_theme"                   |
-      | "uri": "http://www.footheme.com"      |
-      | "author": "Foo Man"                   |
-      | "author_uri": "http://www.fooman.com" |
-
-  Scenario: Creating a new project without any arguments
-    Given a WordPress installation exists at "wordpress"
-    When I run `forge create foo` interactively
-    And I type "wordpress"
-    Then the forge skeleton should be created in directory "foo"
-    And the file "foo/config.json" should contain:
-      | "name": "foo" |
-
-  Scenario: Creating a new project with all prompts
-    Given a WordPress installation exists at "wordpress"
-    When I run `forge create foo -i` interactively
-    And I type "foo_theme"
-    And I type "http://www.footheme.com"
-    And I type "Foo Man"
-    And I type "http://www.fooman.com"
-    And I type "wordpress"
-    Then the forge skeleton should be created in directory "foo"
-    And the file "foo/config.json" should contain:
-      | "name": "foo_theme"                   |
-      | "uri": "http://www.footheme.com"      |
-      | "author": "Foo Man"                   |
-      | "author_uri": "http://www.fooman.com" |

data/features/link.feature

@@ -1,14 +0,0 @@
-Feature: Symbolic link creation via the link command
-
-  Scenario: Linking a project to a WordPress install
-    Given a WordPress installation exists at "wordpress"
-    And I am in a forge project named "awesome_theme"
-    When I successfully run `forge link ../wordpress`
-    Then a directory named "../wordpress/wp-content/themes/awesome_theme" should exist
-
-  Scenario: Linking a project to a bogus directory
-    Given I am in a forge project named "awesome_theme"
-    When I run `forge link ../wordpress`
-    Then the exit status should be 1
-    And the output should contain "Sorry, we couldn't find a wordpress installation"
-    And a directory named "../wordpress/wp-content/themes/awesome_theme" should not exist