fones 0.1.1 → 0.1.2

data/layouts/default/functions/library/custom-post-type.php.erb

@@ -1,122 +1,121 @@
 <?php
-/* Bones Custom Post Type Example
-This page walks you through creating
+/* <%= theme_id %> Custom Post Type Example
+This page walks you through creating 
 a custom post type and taxonomies. You
-can edit this one or copy the following code
-to create another one.
+can edit this one or copy the following code 
+to create another one. 
 
-I put this in a separate file so as to
+I put this in a separate file so as to 
 keep it organized. I find it easier to edit
 and change things if they are concentrated
 in their own file.
 
-Developed by: Eddie Machado
-URL: http://themble.com/bones/
+Developed by: <%= config[:author] %>
+URL: <%= config[:author_uri] %>
 */
 
 
 // let's create the function for the custom type
 function custom_post_example() {
-	// creating (registering) the custom type
+	// creating (registering) the custom type 
 	register_post_type( 'custom_type', /* (http://codex.wordpress.org/Function_Reference/register_post_type) */
 	 	// let's now add all the options for this post type
 		array('labels' => array(
-'name' => __('Custom Types', '<%= theme_id %>theme'), /* This is the Title of the Group */
-'singular_name' => __('Custom Post', '<%= theme_id %>theme'), /* This is the individual type */
-'all_items' => __('All Custom Posts', '<%= theme_id %>theme'), /* the all items menu item */
-'add_new' => __('Add New', '<%= theme_id %>theme'), /* The add new menu item */
-'add_new_item' => __('Add New Custom Type', '<%= theme_id %>theme'), /* Add New Display Title */
-'edit' => __( 'Edit', '<%= theme_id %>theme' ), /* Edit Dialog */
-'edit_item' => __('Edit Post Types', '<%= theme_id %>theme'), /* Edit Display Title */
-'new_item' => __('New Post Type', '<%= theme_id %>theme'), /* New Display Title */
-'view_item' => __('View Post Type', '<%= theme_id %>theme'), /* View Display Title */
-'search_items' => __('Search Post Type', '<%= theme_id %>theme'), /* Search Custom Type Title */
-'not_found' =>  __('Nothing found in the Database.', '<%= theme_id %>theme'), /* This displays if there are no entries yet */
-'not_found_in_trash' => __('Nothing found in Trash', '<%= theme_id %>theme'), /* This displays if there is nothing in the trash */
-'parent_item_colon' => ''
-), /* end of arrays */
-'description' => __( 'This is the example custom post type', '<%= theme_id %>theme' ), /* Custom Type Description */
-'public' => true,
-'publicly_queryable' => true,
-'exclude_from_search' => false,
-'show_ui' => true,
-'query_var' => true,
-'menu_position' => 8, /* this is what order you want it to appear in on the left hand side menu */
-'menu_icon' => get_stylesheet_directory_uri() . '/img/custom-post-icon.png', /* the icon for the custom post type menu */
-'rewrite'	=> array( 'slug' => 'custom_type', 'with_front' => false ), /* you can specify its url slug */
-'has_archive' => 'custom_type', /* you can rename the slug here */
-'capability_type' => 'post',
-'hierarchical' => false,
-/* the next one is important, it tells what's enabled in the post editor */
-'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'sticky')
-) /* end of options */
-); /* end of register post type */
-
-/* this adds your post categories to your custom post type */
-register_taxonomy_for_object_type('category', 'custom_type');
-/* this adds your post tags to your custom post type */
-register_taxonomy_for_object_type('post_tag', 'custom_type');
-
-}
-
-// adding the function to the Wordpress init
-add_action( 'init', 'custom_post_example');
-
-/*
-for more information on taxonomies, go here:
-http://codex.wordpress.org/Function_Reference/register_taxonomy
-*/
-
-// now let's add custom categories (these act like categories)
-register_taxonomy( 'custom_cat',
-array('custom_type'), /* if you change the name of register_post_type( 'custom_type', then you have to change this */
-array('hierarchical' => true,     /* if this is true, it acts like categories */
-'labels' => array(
-'name' => __( 'Custom Categories', '<%= theme_id %>theme' ), /* name of the custom taxonomy */
-'singular_name' => __( 'Custom Category', '<%= theme_id %>theme' ), /* single taxonomy name */
-'search_items' =>  __( 'Search Custom Categories', '<%= theme_id %>theme' ), /* search title for taxomony */
-'all_items' => __( 'All Custom Categories', '<%= theme_id %>theme' ), /* all title for taxonomies */
-'parent_item' => __( 'Parent Custom Category', '<%= theme_id %>theme' ), /* parent title for taxonomy */
-'parent_item_colon' => __( 'Parent Custom Category:', '<%= theme_id %>theme' ), /* parent taxonomy title */
-'edit_item' => __( 'Edit Custom Category', '<%= theme_id %>theme' ), /* edit custom taxonomy title */
-'update_item' => __( 'Update Custom Category', '<%= theme_id %>theme' ), /* update title for taxonomy */
-'add_new_item' => __( 'Add New Custom Category', '<%= theme_id %>theme' ), /* add new title for taxonomy */
-'new_item_name' => __( 'New Custom Category Name', '<%= theme_id %>theme' ) /* name title for taxonomy */
-),
-'show_admin_column' => true,
-'show_ui' => true,
-'query_var' => true,
-'rewrite' => array( 'slug' => 'custom-slug' ),
-)
-);
-
-// now let's add custom tags (these act like categories)
-register_taxonomy( 'custom_tag',
-array('custom_type'), /* if you change the name of register_post_type( 'custom_type', then you have to change this */
-array('hierarchical' => false,    /* if this is false, it acts like tags */
-'labels' => array(
-'name' => __( 'Custom Tags', '<%= theme_id %>theme' ), /* name of the custom taxonomy */
-'singular_name' => __( 'Custom Tag', '<%= theme_id %>theme' ), /* single taxonomy name */
-'search_items' =>  __( 'Search Custom Tags', '<%= theme_id %>theme' ), /* search title for taxomony */
-'all_items' => __( 'All Custom Tags', '<%= theme_id %>theme' ), /* all title for taxonomies */
-'parent_item' => __( 'Parent Custom Tag', '<%= theme_id %>theme' ), /* parent title for taxonomy */
-'parent_item_colon' => __( 'Parent Custom Tag:', '<%= theme_id %>theme' ), /* parent taxonomy title */
-'edit_item' => __( 'Edit Custom Tag', '<%= theme_id %>theme' ), /* edit custom taxonomy title */
-'update_item' => __( 'Update Custom Tag', '<%= theme_id %>theme' ), /* update title for taxonomy */
-'add_new_item' => __( 'Add New Custom Tag', '<%= theme_id %>theme' ), /* add new title for taxonomy */
-'new_item_name' => __( 'New Custom Tag Name', '<%= theme_id %>theme' ) /* name title for taxonomy */
-),
-'show_admin_column' => true,
-'show_ui' => true,
-'query_var' => true,
-)
-);
-
-/*
-looking for custom meta boxes?
-check out this fantastic tool:
-https://github.com/jaredatch/Custom-Metaboxes-and-Fields-for-WordPress
-*/
+			'name' => __('Custom Types', '<%= theme_id %>theme'), /* This is the Title of the Group */
+			'singular_name' => __('Custom Post', '<%= theme_id %>theme'), /* This is the individual type */
+			'all_items' => __('All Custom Posts', '<%= theme_id %>theme'), /* the all items menu item */
+			'add_new' => __('Add New', '<%= theme_id %>theme'), /* The add new menu item */
+			'add_new_item' => __('Add New Custom Type', '<%= theme_id %>theme'), /* Add New Display Title */
+			'edit' => __( 'Edit', '<%= theme_id %>theme' ), /* Edit Dialog */
+			'edit_item' => __('Edit Post Types', '<%= theme_id %>theme'), /* Edit Display Title */
+			'new_item' => __('New Post Type', '<%= theme_id %>theme'), /* New Display Title */
+			'view_item' => __('View Post Type', '<%= theme_id %>theme'), /* View Display Title */
+			'search_items' => __('Search Post Type', '<%= theme_id %>theme'), /* Search Custom Type Title */ 
+			'not_found' =>  __('Nothing found in the Database.', '<%= theme_id %>theme'), /* This displays if there are no entries yet */ 
+			'not_found_in_trash' => __('Nothing found in Trash', '<%= theme_id %>theme'), /* This displays if there is nothing in the trash */
+			'parent_item_colon' => ''
+			), /* end of arrays */
+			'description' => __( 'This is the example custom post type', '<%= theme_id %>theme' ), /* Custom Type Description */
+			'public' => true,
+			'publicly_queryable' => true,
+			'exclude_from_search' => false,
+			'show_ui' => true,
+			'query_var' => true,
+			'menu_position' => 8, /* this is what order you want it to appear in on the left hand side menu */ 
+			'menu_icon' => get_stylesheet_directory_uri() . '/library/images/custom-post-icon.png', /* the icon for the custom post type menu */
+			'rewrite'	=> array( 'slug' => 'custom_type', 'with_front' => false ), /* you can specify its url slug */
+			'has_archive' => 'custom_type', /* you can rename the slug here */
+			'capability_type' => 'post',
+			'hierarchical' => false,
+			/* the next one is important, it tells what's enabled in the post editor */
+			'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'sticky')
+	 	) /* end of options */
+	); /* end of register post type */
+	
+	/* this adds your post categories to your custom post type */
+	register_taxonomy_for_object_type('category', 'custom_type');
+	/* this adds your post tags to your custom post type */
+	register_taxonomy_for_object_type('post_tag', 'custom_type');
+	
+} 
 
+	// adding the function to the Wordpress init
+	add_action( 'init', 'custom_post_example');
+	
+	/*
+	for more information on taxonomies, go here:
+	http://codex.wordpress.org/Function_Reference/register_taxonomy
+	*/
+	
+	// now let's add custom categories (these act like categories)
+    register_taxonomy( 'custom_cat', 
+    	array('custom_type'), /* if you change the name of register_post_type( 'custom_type', then you have to change this */
+    	array('hierarchical' => true,     /* if this is true, it acts like categories */             
+    		'labels' => array(
+    			'name' => __( 'Custom Categories', '<%= theme_id %>theme' ), /* name of the custom taxonomy */
+    			'singular_name' => __( 'Custom Category', '<%= theme_id %>theme' ), /* single taxonomy name */
+    			'search_items' =>  __( 'Search Custom Categories', '<%= theme_id %>theme' ), /* search title for taxomony */
+    			'all_items' => __( 'All Custom Categories', '<%= theme_id %>theme' ), /* all title for taxonomies */
+    			'parent_item' => __( 'Parent Custom Category', '<%= theme_id %>theme' ), /* parent title for taxonomy */
+    			'parent_item_colon' => __( 'Parent Custom Category:', '<%= theme_id %>theme' ), /* parent taxonomy title */
+    			'edit_item' => __( 'Edit Custom Category', '<%= theme_id %>theme' ), /* edit custom taxonomy title */
+    			'update_item' => __( 'Update Custom Category', '<%= theme_id %>theme' ), /* update title for taxonomy */
+    			'add_new_item' => __( 'Add New Custom Category', '<%= theme_id %>theme' ), /* add new title for taxonomy */
+    			'new_item_name' => __( 'New Custom Category Name', '<%= theme_id %>theme' ) /* name title for taxonomy */
+    		),
+    		'show_admin_column' => true, 
+    		'show_ui' => true,
+    		'query_var' => true,
+    		'rewrite' => array( 'slug' => 'custom-slug' ),
+    	)
+    );   
+    
+	// now let's add custom tags (these act like categories)
+    register_taxonomy( 'custom_tag', 
+    	array('custom_type'), /* if you change the name of register_post_type( 'custom_type', then you have to change this */
+    	array('hierarchical' => false,    /* if this is false, it acts like tags */                
+    		'labels' => array(
+    			'name' => __( 'Custom Tags', '<%= theme_id %>theme' ), /* name of the custom taxonomy */
+    			'singular_name' => __( 'Custom Tag', '<%= theme_id %>theme' ), /* single taxonomy name */
+    			'search_items' =>  __( 'Search Custom Tags', '<%= theme_id %>theme' ), /* search title for taxomony */
+    			'all_items' => __( 'All Custom Tags', '<%= theme_id %>theme' ), /* all title for taxonomies */
+    			'parent_item' => __( 'Parent Custom Tag', '<%= theme_id %>theme' ), /* parent title for taxonomy */
+    			'parent_item_colon' => __( 'Parent Custom Tag:', '<%= theme_id %>theme' ), /* parent taxonomy title */
+    			'edit_item' => __( 'Edit Custom Tag', '<%= theme_id %>theme' ), /* edit custom taxonomy title */
+    			'update_item' => __( 'Update Custom Tag', '<%= theme_id %>theme' ), /* update title for taxonomy */
+    			'add_new_item' => __( 'Add New Custom Tag', '<%= theme_id %>theme' ), /* add new title for taxonomy */
+    			'new_item_name' => __( 'New Custom Tag Name', '<%= theme_id %>theme' ) /* name title for taxonomy */
+    		),
+    		'show_admin_column' => true,
+    		'show_ui' => true,
+    		'query_var' => true,
+    	)
+    ); 
+    
+    /*
+    	looking for custom meta boxes?
+    	check out this fantastic tool:
+    	https://github.com/jaredatch/Custom-Metaboxes-and-Fields-for-WordPress
+    */
 
 ?>

data/layouts/default/functions/library/translation/default.po

@@ -4,17 +4,16 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-02 22:11+0100\n"
 "PO-Revision-Date: \n"
-"Language-Team: \n"
+"Language-Team: fulgor <frag.fulgor@gmail.com>\n"
 "Language-Team: fulgor <frag.fulgor@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-KeywordsList: __;_e;_n\n"
-"X-Poedit-Basepath: /Users/joey/Downloads\n"
+"X-Poedit-Basepath: /home/fulgor/GIT/bones\n"
 "Last-Translator: \n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SearchPath-0: /Users/joey/Downloads\n"
+"X-Poedit-SearchPath-0: /home/fulgor/GIT/bones\n"
 
 #: comments.php:12
 msgid "This post is password protected. Enter the password to view comments."

data/layouts/default/functions/library/translation/translation.php.erb

@@ -1,10 +1,10 @@
 <?php
-/* Welcome to Bones :)
-Thanks to the fantastic work by Bones users, we've now
-the ability to translate Bones into different languages.
+/* Welcome to <%= theme_id %> :)
+Thanks to the fantastic work by <%= theme_id %> users, we've now
+the ability to translate <%= theme_id %> into different languages.
 
-Developed by: Eddie Machado
-URL: http://themble.com/bones/
+Developed by: <%= config[:author] %>
+URL: <%= config[:author_uri] %>
 */
 
 

data/lib/fones.rb

@@ -1,11 +1,11 @@
-require 'forge/error'
+require 'fones/error'
 
 module Fones
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  autoload :Guard, 'forge/guard'
-  autoload :CLI, 'forge/cli'
-  autoload :Project, 'forge/project'
-  autoload :Builder, 'forge/builder'
-  autoload :Generator, 'forge/generator'
-  autoload :Config, 'forge/config'
+  autoload :Guard, 'fones/guard'
+  autoload :CLI, 'fones/cli'
+  autoload :Project, 'fones/project'
+  autoload :Builder, 'fones/builder'
+  autoload :Generator, 'fones/generator'
+  autoload :Config, 'fones/config'
 end

data/lib/{forge → fones}/builder.rb

@@ -1,9 +1,8 @@
 require 'sprockets'
 require 'sprockets-sass'
 require 'sass'
-require 'less'
 require 'zip/zip'
-require 'forge/engines'
+require 'fones/engines'
 
 module Fones
   class Builder

data/lib/{forge → fones}/cli.rb

@@ -1,9 +1,9 @@
 require 'thor'
 require 'yaml'
-require 'guard/forge/assets'
-require 'guard/forge/config'
-require 'guard/forge/templates'
-require 'guard/forge/functions'
+require 'guard/fones/assets'
+require 'guard/fones/config'
+require 'guard/fones/templates'
+require 'guard/fones/functions'
 
 module Fones
   class CLI < Thor
@@ -23,7 +23,7 @@ module Fones
 
     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"
+      "To compile the theme use the `fones watch` command"
     def link(path)
       project = Fones::Project.new('.', self)
 

data/lib/{forge → fones}/config.rb

@@ -2,6 +2,8 @@ module Fones
   # Reads/Writes a configuration file in the user's home directory
   #
   class Config
+    
+    require 'yaml'
 
     @config
 
@@ -29,16 +31,18 @@ module Fones
 
     # Returns the path to the user's configuration file
     def config_file
-      @config_file ||= File.expand_path(File.join('~', '.forge', 'config.yml'))
+      @config_file ||= File.expand_path(File.join('~', '.fones', 'config.yml'))
     end
 
     # Writes the configuration file
     def write(options={})
+
       # If we're unit testing then it helps to use a
       # StringIO object instead of a file buffer
       io = options[:io] || File.open(self.config_file, 'w')
 
-      io.write JSON.generate(@config)
+      # io.write JSON.generate(@config)
+      io.write @config.to_yaml
 
       io.close
 
@@ -49,11 +53,14 @@ module Fones
     #
     # If file does not exist then it will be created
     def read
-      return write unless File.exists?(self.config_file)
+      return write unless File.exists?(self.config_file) 
+
+      # data = File.open(self.config_file).read
 
-      data = File.open(self.config_file).read
+      @config = YAML::load_file(self.config_file) unless self.config_file.empty?
 
-      @config = data.empty? ? {} : JSON.parse(data)
+      # @config = data.empty? ? {} : JSON.parse(data)
+      # @config = data.empty? ? {} : YAML::parse(data)
 
       self
     end

data/lib/{forge → fones}/generator.rb

@@ -27,8 +27,7 @@ module Fones
 
         ['includes'],
 
-        ['templates', 'pages'],
-        ['templates', 'partials'],
+        ['templates'],
       ]
 
       # Build out Fones structure in the source directory

data/lib/{forge → fones}/guard.rb

@@ -28,19 +28,19 @@ module Fones
       config_file = @project.config_file.gsub(/#{@project.root}\//, '')
 
       guardfile_contents = %Q{
-        guard 'forgeconfig'#{options_hash} do
+        guard 'fonesconfig'#{options_hash} do
           watch("#{config_file}")
         end
-        guard 'forgeassets' do
+        guard 'fonesassets' do
           watch(%r{#{assets_path}/js/*})
           watch(%r{#{assets_path}/css/*})
           watch(%r{#{assets_path}/img/*})
         end
-        guard 'forgetemplates' do
+        guard 'fonestemplates' do
           watch(%r{#{source_path}/templates/*})
           watch(%r{#{source_path}/partials/*})
         end
-        guard 'forgefunctions' do
+        guard 'fonesfunctions' do
           watch(%r{#{source_path}/functions/*})
           watch(%r{#{source_path}/includes/*})
         end

data/lib/{forge → fones}/project.rb

@@ -30,7 +30,7 @@ module Fones
     end
 
     def build_path
-      File.join(self.root, '.forge', 'build')
+      File.join(self.root, '.fones', 'build')
     end
 
     def source_path
@@ -62,7 +62,7 @@ module Fones
     end
 
     def global_config_file
-      @global_config_file ||= File.join(ENV['HOME'], '.forge', 'config.rb')
+      @global_config_file ||= File.join(ENV['HOME'], '.fones', 'config.rb')
     end
 
     # Create a symlink from source to the project build dir