forge 0.0.1 → 0.0.2

data/.gitmodules

@@ -1,3 +1,3 @@
-[submodule "layouts/lib/forge-settings"]
-	path = layouts/lib/forge-settings
-	url = git@github.com:jestro/forge-settings.git
+[submodule "layouts/lib/struts"]
+	path = layouts/lib/struts
+	url = git@github.com:jestro/struts.git

data/Gemfile

@@ -3,14 +3,15 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "thor"
-gem "guard"
-gem "sprockets"
-gem "rubyzip"
-gem "json"
-gem "sass"
-gem "sprockets-sass"
-gem "compass"
+gem "thor", "~> 0.14.6"
+gem "guard", "~> 0.8.4"
+gem "sprockets", "~> 2.0.2"
+gem "rubyzip", "~> 0.9.4"
+gem "json", "~> 1.6.1"
+gem "sass", "~> 3.1.8"
+gem "sprockets-sass", "~> 0.3.0"
+gem "compass", "~> 0.11.5"
+gem 'rack', '1.3.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -29,7 +29,7 @@ GEM
     gherkin (2.5.1)
       json (>= 1.4.6)
     git (1.2.5)
-    guard (0.8.1)
+    guard (0.8.4)
       thor (~> 0.14.6)
     hike (1.2.1)
     jeweler (1.6.4)
@@ -50,12 +50,12 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    sass (3.1.7)
-    sprockets (2.0.0)
+    sass (3.1.8)
+    sprockets (2.0.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
-    sprockets-sass (0.2.3)
+    sprockets-sass (0.3.0)
       sprockets (~> 2.0)
     term-ansicolor (1.0.6)
     thor (0.14.6)
@@ -67,15 +67,16 @@ PLATFORMS
 DEPENDENCIES
   aruba
   bundler (~> 1.0.0)
-  compass
+  compass (~> 0.11.5)
   cucumber
-  guard
+  guard (~> 0.8.4)
   jeweler (~> 1.6.4)
-  json
+  json (~> 1.6.1)
+  rack (= 1.3.3)
   rcov
   rspec
-  rubyzip
-  sass
-  sprockets
-  sprockets-sass
-  thor
+  rubyzip (~> 0.9.4)
+  sass (~> 3.1.8)
+  sprockets (~> 2.0.2)
+  sprockets-sass (~> 0.3.0)
+  thor (~> 0.14.6)

data/README.md

@@ -1,12 +1,12 @@
 ## Forge is a toolkit for bootstrapping and developing WordPress themes.
 
-[Forge website and screencast](http://forge.thethemefoundry.com/)
+[Forge website](http://forge.thethemefoundry.com/)
 
 [User's manual](http://forge.thethemefoundry.com/manual)
 
 -----
 
-Current Version: **0.1.0**
+Current Version: **0.0.2**
 
 Install Forge (requires [Ruby](http://www.ruby-lang.org/) and [RubyGems](http://rubygems.org/)):
 
@@ -14,11 +14,32 @@ Install Forge (requires [Ruby](http://www.ruby-lang.org/) and [RubyGems](http://
 
 Create your new theme project:
 
-    $ forge create themename
+    $ forge create your_theme
+
+Change to your new project directory:
+
+    $ cd your_theme
+
+Link to your WordPress theme folder:
+
+    $ forge link /path/to/wordpress/wp-content/themes/your_theme
 
 Watch for changes and start developing!
 
-    $ cd themename
     $ forge watch
 
+Press Ctrl + C to exit watch mode
+
+Build your theme into the build_here directory:
+
+    $ forge build build_here
+
+Package your theme as your_theme.zip:
+
+    $ forge package your_theme
+
+Get a little help with the Forge commands:
+
+    $ forge help
+
 See the [user's manual](http://forge.thethemefoundry.com/manual) for more information.

data/Rakefile

@@ -15,14 +15,14 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "forge"
-  gem.homepage = "http://nohomepageyet.org"
+  gem.homepage = "http://forge.thethemefoundry.com"
   gem.license = "MIT"
   gem.summary = %Q{A tool for developing wordpress themes}
   gem.description = %Q{A toolkit for bootstrapping and developing WordPress themes.}
   gem.email = "aadams@jestro.com"
   gem.authors = ["Andy Adams", "Drew Strojny", "Matt Button"]
   # dependencies defined in Gemfile
-  gem.files.include Dir.glob('layouts/lib/forge-settings/**/*')
+  gem.files.include Dir.glob('**/*')
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/forge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forge"
-  s.version = "0.0.0"
+  s.version = "0.0.2"
 
   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-06"
+  s.date = "2011-10-07"
   s.description = "A toolkit for bootstrapping and developing WordPress themes."
   s.email = "aadams@jestro.com"
   s.executables = ["forge"]
@@ -36,6 +36,8 @@ Gem::Specification.new do |s|
     "layouts/config/config.json.erb",
     "layouts/config/stylesheet_header.erb",
     "layouts/default/functions/functions.php.erb",
+    "layouts/default/javascripts/admin.js",
+    "layouts/default/javascripts/theme.js",
     "layouts/default/stylesheets/_reset.scss",
     "layouts/default/stylesheets/_typography.scss",
     "layouts/default/stylesheets/style.css.scss.erb",
@@ -51,13 +53,13 @@ Gem::Specification.new do |s|
     "layouts/default/templates/search.php.erb",
     "layouts/default/templates/sidebar.php",
     "layouts/default/templates/single.php.erb",
-    "layouts/lib/forge-settings/README.md",
-    "layouts/lib/forge-settings/classes/settings.php",
-    "layouts/lib/forge-settings/classes/settings/collection.php",
-    "layouts/lib/forge-settings/classes/settings/option.php",
-    "layouts/lib/forge-settings/classes/settings/option/select.php",
-    "layouts/lib/forge-settings/classes/settings/option/text.php",
-    "layouts/lib/forge-settings/classes/settings/section.php",
+    "layouts/lib/struts/README.md",
+    "layouts/lib/struts/classes/settings.php",
+    "layouts/lib/struts/classes/settings/collection.php",
+    "layouts/lib/struts/classes/settings/option.php",
+    "layouts/lib/struts/classes/settings/option/select.php",
+    "layouts/lib/struts/classes/settings/option/text.php",
+    "layouts/lib/struts/classes/settings/section.php",
     "lib/forge.rb",
     "lib/forge/builder.rb",
     "lib/forge/cli.rb",
@@ -71,11 +73,12 @@ 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"
   ]
-  s.homepage = "http://nohomepageyet.org"
+  s.homepage = "http://forge.thethemefoundry.com"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.11"
@@ -85,14 +88,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<guard>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<sass>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets-sass>, [">= 0"])
-      s.add_runtime_dependency(%q<compass>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
+      s.add_runtime_dependency(%q<guard>, ["~> 0.8.4"])
+      s.add_runtime_dependency(%q<sprockets>, ["~> 2.0.2"])
+      s.add_runtime_dependency(%q<rubyzip>, ["~> 0.9.4"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.6.1"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3.1.8"])
+      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_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
@@ -100,14 +104,15 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<guard>, [">= 0"])
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<rubyzip>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<sass>, [">= 0"])
-      s.add_dependency(%q<sprockets-sass>, [">= 0"])
-      s.add_dependency(%q<compass>, [">= 0"])
+      s.add_dependency(%q<thor>, ["~> 0.14.6"])
+      s.add_dependency(%q<guard>, ["~> 0.8.4"])
+      s.add_dependency(%q<sprockets>, ["~> 2.0.2"])
+      s.add_dependency(%q<rubyzip>, ["~> 0.9.4"])
+      s.add_dependency(%q<json>, ["~> 1.6.1"])
+      s.add_dependency(%q<sass>, ["~> 3.1.8"])
+      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<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
@@ -116,14 +121,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<guard>, [">= 0"])
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<rubyzip>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<sass>, [">= 0"])
-    s.add_dependency(%q<sprockets-sass>, [">= 0"])
-    s.add_dependency(%q<compass>, [">= 0"])
+    s.add_dependency(%q<thor>, ["~> 0.14.6"])
+    s.add_dependency(%q<guard>, ["~> 0.8.4"])
+    s.add_dependency(%q<sprockets>, ["~> 2.0.2"])
+    s.add_dependency(%q<rubyzip>, ["~> 0.9.4"])
+    s.add_dependency(%q<json>, ["~> 1.6.1"])
+    s.add_dependency(%q<sass>, ["~> 3.1.8"])
+    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<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])

data/layouts/config/config.json.erb

@@ -9,5 +9,25 @@
   "author": "<%= config[:author] %>",
 
   // The author's website
-  "author_uri": "<%= config[:author_uri] %>"
+  "author_uri": "<%= config[:author_uri] %>",
+
+  // Description of the theme
+  "description": "<%= config[:description] %>",
+
+  // Description of the theme
+  "version_number": "<%= config[:version_number] %>",
+
+  // Description of the theme
+  "license_name": "<%= config[:license_name] %>",
+
+  // Description of the theme
+  "license_uri": "<%= config[:license_uri] %>",
+
+  // Tags for this theme, as an array
+  // For Example:
+  // "tags": ["blue", "white", "two-columns"],
+  "tags": <%= config[:tags] ? config[:tags] : "[]" %>,
+
+  // Additional comments (optional)
+  "comments": "<%= config[:comments] %>"
 }

data/layouts/config/stylesheet_header.erb

@@ -7,5 +7,9 @@
  * Version: <%= config["version_number"] if config["version_number"] %>
  * License: <%= config["license_name"] if config["license_name"] %>
  * License URI: <%= config["license_uri"] if config["license_uri"] %>
- * Tags: <%= config["tags"] if config["tags"] %>
+ * Tags: <%= config["tags"].join(", ") if config["tags"] %>
+<% if config["comments"] -%>
+ *
+ * <%= config["comments"] %>
+<% end -%>
  */

data/layouts/default/javascripts/admin.js

@@ -0,0 +1 @@
+// Theme Options JavaScript goes here

data/layouts/default/javascripts/theme.js

@@ -0,0 +1 @@
+// Regular theme JavaScript goes here

data/layouts/default/stylesheets/_reset.scss

@@ -2,4 +2,4 @@
  * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
 
 @import "blueprint/reset";
-@inclue blueprint-reset;
+@include blueprint-global-reset;

data/layouts/default/stylesheets/style.css.scss.erb

@@ -1,10 +1,11 @@
-// This is your main stylesheet file, you can use SASS in here to include css partials
+// This is your master stylesheet
 
+// Use SASS to include CSS partials
 @import "reset";
 @import "typography";
-
 @import "blueprint/grid";
 
+// Add some basic styling
 .clear {
   clear: both;
 }

data/layouts/default/templates/404.php.erb

@@ -1,10 +1,10 @@
 <?php get_header(); ?>
-<div id="content" class="clear">
-	<h1 class="page-title"><?php _e( '404: Page Not Found', '<%= theme_id %>' ); ?></h1>
-	<div class="entry entry-page clear">
+	<h1 class="page-title">
+		<?php _e( '404: Page Not Found', '<%= theme_id %>' ); ?>
+	</h1>
+	<div>
 		<p><?php _e( 'We are terribly sorry, but the URL you typed no longer exists. It might have been moved or deleted. Try searching the site:', '<%= theme_id %>' ); ?></p>
 		<?php get_search_form(); ?>
 	</div>
-</div><!--end content-->
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>

data/layouts/default/templates/attachment.php.erb

@@ -1,8 +1,7 @@
 <?php get_header(); ?>
-<div id="content" class="clear">
 	<?php the_post(); ?>
 	<h1 class="page-title"><?php the_title(); ?></h1>
-	<div class="entry entry-page clear">
+	<div>
 		<a href="<?php echo wp_get_attachment_url( $post->ID ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
 			<?php
 				if ( wp_attachment_is_image ( $post->ID ) ) {
@@ -29,6 +28,5 @@
 			<a href="<?php echo get_permalink( $post->post_parent ); ?>"><?php _e( 'Return to gallery', '<%= theme_id %>' ); ?></a>
 		</div>
 	</div>
-</div>
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>

data/layouts/default/templates/footer.php

@@ -1,8 +1,8 @@
-	<div id="copyright" class="clear">
+	<div id="footer">
 		<p>
 			<a href="http://wordpress.org/" rel="generator">Proudly powered by WordPress</a>
 		</p>
-	</div><!--end copyright-->
+	</div><!--end footer-->
 </div><!--end container-->
 <?php wp_footer(); ?>
 </body>

data/layouts/default/templates/header.php.erb

@@ -9,22 +9,21 @@
 	<?php wp_head(); ?>
 </head>
 <body <?php body_class(); ?>>
-	<div id="container" class="clear">
-		<div id="header" class="clear">
-			<div id="title">
-				<?php if ( is_front_page() ) echo( '<h1>' ); ?>
-					<a href="<?php echo home_url(); ?>"><?php bloginfo( 'name' ); ?></a>
-				<?php if ( is_front_page() ) echo( '</h1>' ); ?>
-			</div>
-			<?php
-				wp_nav_menu(
-					array(
-						'theme_location'  => 'nav-1',
-						'container_id'    => 'navigation',
-						'container_class' => 'clear',
-						'menu_class'      => 'nav',
-						'depth'           => '2'
-						)
-					);
-			?>
-		</div><!--end header-->
+	<div id="header" class="clear">
+		<div id="title">
+			<?php if ( is_front_page() ) echo( '<h1>' ); ?>
+				<a href="<?php echo home_url(); ?>"><?php bloginfo( 'name' ); ?></a>
+			<?php if ( is_front_page() ) echo( '</h1>' ); ?>
+		</div>
+		<?php
+			wp_nav_menu(
+				array(
+					'theme_location'  => 'nav-1',
+					'container_id'    => 'navigation',
+					'container_class' => 'clear',
+					'menu_class'      => 'nav',
+					'depth'           => '2'
+					)
+				);
+		?>
+	</div><!--end header-->

data/layouts/default/templates/index.php

@@ -1,6 +1,4 @@
 <?php get_header(); ?>
-<div id="content" class="clear">
-	<?php get_template_part( 'loop' ); ?>
-</div><!--end content-->
+<?php get_template_part( 'loop' ); ?>
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>

data/layouts/default/templates/page.php

@@ -1,18 +1,14 @@
 <?php get_header(); ?>
-<div id="content" class="clear">
 	<?php the_post(); ?>
-		<div id="page-<?php the_ID(); ?>" class="page clear">
+		<div id="page-<?php the_ID(); ?>">
 			<?php if ( has_post_thumbnail() ) { ?>
-				<div class="entry-page-image">
+				<div>
 					<?php the_post_thumbnail(); ?>
 				</div>
 			<?php } ?>
 			<h1><?php the_title(); ?></h1>
-			<div class="entry entry-page clear">
-				<?php the_content(); ?>
-			</div>
+			<?php the_content(); ?>
 		</div>
 	<?php comments_template( '', true ); ?>
-</div><!--end content-->
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>

data/layouts/default/templates/partials/loop.php.erb

@@ -1,9 +1,11 @@
-<?php if (have_posts()) : ?>
+<?php if ( have_posts() ) : ?>
 	<?php while ( have_posts() ) : the_post(); ?>
-		<div id="post-<?php the_ID(); ?>" <?php post_class( 'clear' ); ?>>
-			<div class="post-header clear">
+		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<div class="post-header">
 				<h2 class="post-title">
-					<a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php esc_attr( sprintf( __( 'Permanent Link to %s', '<%= theme_id %>' ), the_title_attribute( 'echo=false' ) ) ); ?>"><?php the_title(); ?></a>
+					<a href="<?php the_permalink(); ?>" rel="bookmark">
+					  <?php the_title(); ?>
+					</a>
 				</h2>
 				<p><?php the_time( __( 'F jS, Y', '<%= theme_id %>' ) ); ?></p>
 				<p><?php the_author(); ?></p>
@@ -13,18 +15,22 @@
 					</a>
 				<?php } ?>
 			</div><!--end post-header-->
-			<div class="entry entry-post clear">
+			<div class="entry">
 				<?php the_content( __( 'Read more', '<%= theme_id %>' )); ?>
 				<?php edit_post_link( __( 'Edit this', '<%= theme_id %>' ), '<p>', '</p>' ); ?>
 			</div><!--end entry-->
-			<div class="post-footer clear">
-				<p><?php comments_popup_link( __( 'Leave a comment', '<%= theme_id %>' ), __( '1 Comment', '<%= theme_id %>' ), __( '% Comments', '<%= theme_id %>' ), NULL, NULL ); ?></p>
+			<div class="post-footer">
+				<p><?php comments_popup_link( __( 'Leave a comment', '<%= theme_id %>' ), __( '1 Comment', '<%= theme_id %>' ), __( '% Comments', '<%= theme_id %>' ) ); ?></p>
 			</div><!--end post-footer-->
 		</div><!--end post-->
 	<?php endwhile; /* rewind or continue if all posts have been fetched */ ?>
-	<div class="pagination index">
-			<div class="alignleft"><?php previous_posts_link( __( '&larr; Newer entries', '<%= theme_id %>' )); ?></div>
-			<div class="alignright"><?php next_posts_link( __( 'Older entries &rarr;', '<%= theme_id %>' )); ?></div>
-	</div><!--end pagination-->
+		<div class="pagination index">
+			<div class="alignleft">
+				<?php previous_posts_link( __( '&larr; Newer entries', '<%= theme_id %>' )); ?>
+			</div>
+			<div class="alignright">
+				<?php next_posts_link( __( 'Older entries &rarr;', '<%= theme_id %>' )); ?>
+			</div>
+		</div><!--end pagination-->
 	<?php else : ?>
 <?php endif; ?>

data/layouts/default/templates/search.php.erb

@@ -1,14 +1,12 @@
 <?php get_header(); ?>
-<h1><?php printf( __( "Search results for '%s'", "<%= theme_id %>" ), get_search_query() ); ?></h1>
-<div id="content" class="clear">
+	<h1><?php printf( __( "Search results for '%s'", "<%= theme_id %>" ), get_search_query() ); ?></h1>
 	<?php if ( have_posts() ) : ?>
 		<?php get_template_part( 'loop' ); ?>
 	<?php else : ?>
 		<div>
 			<p><?php printf( __( 'Sorry, your search for "%s" did not turn up any results. Please try again.', '<%= theme_id %>' ), get_search_query());?></p>
 			<?php get_search_form(); ?>
-		</div><!--end entry-->
+		</div>
 	<?php endif; ?>
-</div><!--end content-->
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>

data/layouts/default/templates/single.php.erb

@@ -1,13 +1,12 @@
 <?php get_header(); ?>
-<div id="content" class="clear">
 	<?php if ( have_posts() ) : ?>
 		<?php while ( have_posts() ) : the_post(); ?>
-			<div id="post-<?php the_ID(); ?>" <?php post_class( 'single' ); ?>>
+			<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 				<h1><?php the_title(); ?></h1>
 				<div>
 					<?php printf( __( 'by %s on', '<%= theme_id %>' ), get_the_author() ); ?> <?php the_date(); ?>
 				</div>
-				<div class="entry single clear">
+				<div class="entry">
 					<?php if ( has_post_thumbnail() ) {
 						the_post_thumbnail();
 					} ?>
@@ -27,6 +26,5 @@
 		<?php endwhile; /* rewind or continue if all posts have been fetched */ ?>
 		<?php comments_template( '', true ); ?>
 	<?php endif; ?>
-</div><!--end content-->
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>

data/layouts/lib/{forge-settings → struts}/README.md

@@ -1,8 +1,8 @@
-## Easy WordPress Theme Options
+## Struts is a simple theme options framework for WordPress.
 
 The goal of this library is to abstract away as much of the WordPress settings API as possible, and make setting up options a breeze!
 
-## Setup
+## Basic setup
 
 * Clone this repository
 * Symlink the 'classes' folder from this library into your functions folder in your theme

data/lib/forge/builder.rb

@@ -13,6 +13,7 @@ module Forge
       @assets_path = @project.assets_path
       @functions_path = @project.functions_path
       @includes_path = @project.includes_path
+      @package_path = @project.package_path
 
       init_sprockets
     end
@@ -26,21 +27,38 @@ module Forge
     end
 
     # Use the rubyzip library to build a zip from the generated source
-    def zip
-      basename = File.basename(@project.root)
+    def zip(filename=nil)
+      filename = filename || File.basename(@project.root)
+      project_base = File.basename(@project.root)
 
-      Zip::ZipFile.open(get_output_filename(basename), Zip::ZipFile::CREATE) do |zip|
-        # Get all filenames in the build directory recursively
-        filenames = Dir[File.join(@project.build_path, '**', '*')]
+      zip_filename = File.join(File.basename(@package_path), "#{filename}.zip")
+      # Create a temporary file for RubyZip to write to
+      temp_filename = "#{zip_filename}.tmp"
 
-        # Remove the build directory path from the filename
-        filenames.collect! {|path| path.gsub(/#{@project.build_path}\//, '')}
+      File.delete(temp_filename) if File.exists?(temp_filename)
 
-        # Add each file in the build directory to the zip file
-        filenames.each do |filename|
-          zip.add File.join(basename, filename), File.join(@project.build_path, filename)
+      # Wrapping the zip creation in Thor's create_file to get "overwrite" prompts
+      # Note: I could be overcomplicating this
+      @task.create_file(zip_filename) do
+        Zip::ZipFile.open(temp_filename, Zip::ZipFile::CREATE) do |zip|
+          # Get all filenames in the build directory recursively
+          filenames = Dir[File.join(@project.build_path, '**', '*')]
+
+          # Remove the build directory path from the filename
+          filenames.collect! {|path| path.gsub(/#{@project.build_path}\//, '')}
+
+          # Add each file in the build directory to the zip file
+          filenames.each do |filename|
+            zip.add File.join(project_base, filename), File.join(@project.build_path, filename)
+          end
         end
+
+        # Give Thor contents of zip file for "overwrite" prompt
+        File.open(temp_filename, 'rb') { |f| f.read }
       end
+
+      # Clean up the temp file
+      File.delete(temp_filename)
     end
 
     # Empty out the build directory
@@ -80,7 +98,7 @@ module Forge
     end
 
     def build_assets
-      [['style.css'], ['js', 'theme.js']].each do |asset|
+      [['style.css'], ['javascripts', 'theme.js'], ['javascripts', 'admin.js']].each do |asset|
         destination = File.join(@project.build_path, asset)
 
         sprocket = @sprockets.find_asset(asset.last)
@@ -89,11 +107,13 @@ module Forge
 
         # Catch any sprockets errors and continue the process
         begin
-          FileUtils.mkdir_p(File.dirname(destination)) unless File.directory?(File.dirname(destination))
-          sprocket.write_to(destination) unless sprocket.nil?
+          @task.shell.mute do
+            FileUtils.mkdir_p(File.dirname(destination)) unless File.directory?(File.dirname(destination))
+            sprocket.write_to(destination) unless sprocket.nil?
 
-          if asset.last == 'style.css' && (not sprockets_error)
-            @task.prepend_file destination, @project.parse_erb(stylesheet_header)
+            if asset.last == 'style.css' && (not sprockets_error)
+              @task.prepend_file destination, @project.parse_erb(stylesheet_header)
+            end
           end
         rescue Exception => e
           @task.say "Error while building #{asset.last}:"
@@ -109,25 +129,29 @@ module Forge
       end
 
       # Copy the images directory over
-      FileUtils.cp_r File.join(@assets_path, 'images'), File.join(@project.build_path)
+      FileUtils.cp_r(File.join(@assets_path, 'images'), @project.build_path)
+
+      # Check for screenshot and move it into main build directory
+      Dir.glob(File.join(@project.build_path, 'images', '*')).each do |filename|
+        if filename.index(/screenshot\.(png|jpg|jpeg|gif)/)
+          FileUtils.mv(filename, @project.build_path + File::SEPARATOR )
+        end
+      end
     end
 
     private
 
     def init_sprockets
+      Compass.configuration do |compass|
+        compass.line_comments = false
+      end
+
       @sprockets = Sprockets::Environment.new
 
       ['javascripts', 'stylesheets'].each do |dir|
         @sprockets.append_path File.join(@assets_path, dir)
       end
 
-
-      # Add all compass frameworks to the sass path
-      # TODO: This feels really hacky - is there a better way?
-      Compass::Frameworks::ALL.each do |framework|
-        Sass::Engine::DEFAULT_OPTIONS[:load_paths] << framework.stylesheets_directory
-      end
-
       @sprockets.context_class.instance_eval do
         def config
           return {:name => 'asd'}
@@ -143,11 +167,12 @@ module Forge
 
     # Generate a unique filename for the zip output
     def get_output_filename(basename)
-      filename = "#{basename}.zip"
+      package_path_base = File.basename(@package_path)
+      filename = File.join(package_path_base, "#{basename}.zip")
 
       i = 1
       while File.exists?(filename)
-        filename = "#{basename}(#{i}).zip"
+        filename = File.join(package_path_base, "#{basename}(#{i}).zip")
         i += 1
       end
 

data/lib/forge/cli.rb

@@ -14,32 +14,15 @@ module Forge
     end
 
     desc "create DIRECTORY", "Creates a Forge project"
-    method_option :name, :type => :string, :desc => "The theme name"
-    method_option :uri,  :type => :string, :desc => "The theme's uri"
-    method_option :author, :type => :string, :desc => "The author of the theme"
-    method_option :author_uri, :type => :string, :desc => "The author's uri"
-    method_option :interactive, :type => :boolean, :desc => "Use interactive configuration setup", :aliases => "-i"
+    method_option :struts, :type => :boolean, :desc => "Include Struts Options Framework"
     def create(dir)
-      prompts = {
-        :name       => "What is the name of this theme?",
-        :uri        => "What is the website for this theme?",
-        :author     => "Who is the author of this theme?",
-        :author_uri => "What is the author's website?"
-      }
-
       theme = {}
-
-      prompts.each do |k,v|
-        theme[k] = options[k]
-        theme[k] = ask(v) if options[:interactive]
-      end
-
-      theme[:name] = dir if (theme[:name].nil? || theme[:name].empty?)
+      theme[:name] = dir
 
       project = Forge::Project.create(dir, theme, self)
     end
 
-    desc "link PATH", "symlink the compiled version of theme to the specified path"
+    desc "link PATH", "Create a symbolic link to the compilation directory"
     long_desc "This command will symlink the compiled version of the theme to the specified path.\n\n"+
       "To compile the theme use the `forge watch` command"
     def link(path)
@@ -51,6 +34,7 @@ module Forge
     end
 
     desc "watch", "Start watch process"
+    long_desc "Watches the source directory in your project for changes, and reflects those changes in a compile folder"
     def watch
       project = Forge::Project.new('.', self)
 
@@ -61,13 +45,24 @@ module Forge
       Forge::Guard.start(project, self)
     end
 
-    desc "package", "Compile and zip your project"
-    def package
+    desc "build DIRECTORY", "Build your theme into specified directory"
+    def build(dir='build')
+      project = Forge::Project.new('.', self)
+
+      builder = Builder.new(project)
+      builder.build
+
+      FileUtils.rm_rf Dir.glob(File.join(dir, '*'))
+      directory(project.build_path, dir)
+    end
+
+    desc "package FILENAME", "Compile and zip your project to FILENAME.zip"
+    def package(filename=nil)
       project = Forge::Project.new('.', self)
 
       builder = Builder.new(project)
       builder.build
-      builder.zip
+      builder.zip(filename)
     end
 
     protected

data/lib/forge/generator.rb

@@ -48,6 +48,15 @@ module Forge
       self
     end
 
+    def copy_javascript
+      source = File.expand_path(File.join(self.layout_path, 'javascripts'))
+      target = File.expand_path(File.join(@project.assets_path, 'javascripts'))
+
+      render_directory(source, target)
+
+      self
+    end
+
     def copy_templates
       source = File.expand_path(File.join(self.layout_path, 'templates'))
       target = File.expand_path(File.join(@project.source_path, 'templates'))
@@ -58,10 +67,10 @@ module Forge
     end
 
     def copy_settings_library
-      settings_path = @task.find_in_source_paths(File.join('lib', 'forge-settings', 'classes'))
+      settings_path = @task.find_in_source_paths(File.join('lib', 'struts', 'classes'))
 
       source = File.expand_path(settings_path)
-      target = File.expand_path(File.join(@project.includes_path, 'forge-settings', '.'))
+      target = File.expand_path(File.join(@project.includes_path, 'struts', '.'))
 
       @task.directory(source, target)
     end
@@ -81,9 +90,10 @@ module Forge
       write_config
       create_structure
       copy_stylesheets
+      copy_javascript
       copy_templates
       copy_functions
-      copy_settings_library
+      copy_settings_library if @task.options[:struts]
       return self
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,99 +11,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000 Z
+date: 2011-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153138780 !ruby/object:Gem::Requirement
+  requirement: &2152342800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153138780
+  version_requirements: *2152342800
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152836320 !ruby/object:Gem::Requirement
+  requirement: &2152341300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152836320
+  version_requirements: *2152341300
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2152834580 !ruby/object:Gem::Requirement
+  requirement: &2152339320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152834580
+  version_requirements: *2152339320
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2152832060 !ruby/object:Gem::Requirement
+  requirement: &2152338580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152832060
+  version_requirements: *2152338580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152825320 !ruby/object:Gem::Requirement
+  requirement: &2152337340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152825320
+  version_requirements: *2152337340
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152809600 !ruby/object:Gem::Requirement
+  requirement: &2152336200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152809600
+  version_requirements: *2152336200
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &2152805540 !ruby/object:Gem::Requirement
+  requirement: &2152335320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152805540
+  version_requirements: *2152335320
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2152799460 !ruby/object:Gem::Requirement
+  requirement: &2152334400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152334400
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2152333480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152799460
+  version_requirements: *2152333480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152795060 !ruby/object:Gem::Requirement
+  requirement: &2152332700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152795060
+  version_requirements: *2152332700
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152780560 !ruby/object:Gem::Requirement
+  requirement: &2152332040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152780560
+  version_requirements: *2152332040
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152777760 !ruby/object:Gem::Requirement
+  requirement: &2152330140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152777760
+  version_requirements: *2152330140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152776020 !ruby/object:Gem::Requirement
+  requirement: &2152329320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +155,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152776020
+  version_requirements: *2152329320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152774320 !ruby/object:Gem::Requirement
+  requirement: &2152328260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +166,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152774320
+  version_requirements: *2152328260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152773220 !ruby/object:Gem::Requirement
+  requirement: &2152327260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +177,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152773220
+  version_requirements: *2152327260
 description: A toolkit for bootstrapping and developing WordPress themes.
 email: aadams@jestro.com
 executables:
@@ -194,6 +205,8 @@ files:
 - layouts/config/config.json.erb
 - layouts/config/stylesheet_header.erb
 - layouts/default/functions/functions.php.erb
+- layouts/default/javascripts/admin.js
+- layouts/default/javascripts/theme.js
 - layouts/default/stylesheets/_reset.scss
 - layouts/default/stylesheets/_typography.scss
 - layouts/default/stylesheets/style.css.scss.erb
@@ -209,13 +222,13 @@ files:
 - layouts/default/templates/search.php.erb
 - layouts/default/templates/sidebar.php
 - layouts/default/templates/single.php.erb
-- layouts/lib/forge-settings/README.md
-- layouts/lib/forge-settings/classes/settings.php
-- layouts/lib/forge-settings/classes/settings/collection.php
-- layouts/lib/forge-settings/classes/settings/option.php
-- layouts/lib/forge-settings/classes/settings/option/select.php
-- layouts/lib/forge-settings/classes/settings/option/text.php
-- layouts/lib/forge-settings/classes/settings/section.php
+- layouts/lib/struts/README.md
+- layouts/lib/struts/classes/settings.php
+- layouts/lib/struts/classes/settings/collection.php
+- layouts/lib/struts/classes/settings/option.php
+- layouts/lib/struts/classes/settings/option/select.php
+- layouts/lib/struts/classes/settings/option/text.php
+- layouts/lib/struts/classes/settings/section.php
 - lib/forge.rb
 - lib/forge/builder.rb
 - lib/forge/cli.rb
@@ -229,10 +242,11 @@ 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
-homepage: http://nohomepageyet.org
+homepage: http://forge.thethemefoundry.com
 licenses:
 - MIT
 post_install_message: 
@@ -247,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 689704686126272199
+      hash: -4281416040129770689
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: