join 0.0.2 → 0.0.3

data/bin/{join-files → join-compile}

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
+
 libdir = File.join(File.dirname(File.dirname(__FILE__)), "lib")
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 

data/lib/join.rb

@@ -1,14 +1,20 @@
+# Copyright (c) 20011 Owain Lewis. owain@owainlewis.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
 $:.unshift File.dirname(__FILE__)
-require "join/version"
+
 require "fileutils"
+require "join/version"
+require 'join/process'
+require 'join/concatenate'
 
 module Join
+
   class << self
     def message(m)
       STDOUT.puts m
     end
   end
+  
 end
 
-require 'join/process'
-require 'join/concatenate'

data/lib/join/process.rb

@@ -9,7 +9,7 @@ module Join
   
     #Return an array of required modules and files
     def required(file)
-      expr = /^\/\/=\s?(.*)$/
+      expr = /^\/\/= require\s?(.*)$/
       file.scan(expr) do |m|
         @required_modules  << m
       end

data/lib/join/version.rb

@@ -1,6 +1,5 @@
 module Join
-  MAJOR_VERSION = 0
-  MINOR = 0
-  TINY = 2
-  VERSION = [MAJOR_VERSION, MINOR, TINY].join(".")
+  VERSION = "0.0.3"
 end
+
+

data/readme.md

@@ -1,7 +1,68 @@
 #Join
 
-Join is a Ruby gem for concatenating together multiple JavaScript files and libraries ready for deployment.
+Join is a Ruby gem for concatenating together multiple JavaScript files and libraries ready for deployment. The primary goals are 
+
++ To provide a pseudo common.js module system for the browser. //= require myfile.js
++ To reduce the number of script tag calls on websites 
++ To make combining multiple js files easier.
+
 Each JavaScript module is created with a time stamp and a path to the original source file.
 
+##Installation
+
 		gem install join
-		join-files /javascripts compressed.js
+		
+##Usage
+		
+The basic idea is to have one main.js file that calls in other dependencies via a simple join statement:
+
+		//= require path_to/somefile.js
+
+You can require other files using the Join require statement (//= require filename.js) like this
+
+		//= require cufon.js
+		//= require lightbox.js
+		//= require plugins/jquery.js
+		
+		(function(){
+			//Application code here
+		})();
+					
+Then run the join-files command in the terminal to join together all your files
+
+		join-compile source_file.js output_file.js
+		
+Sample output should be something like this:
+
+		/*
+		Compiled with Join at 2011-08-28 23:11:02 +0100
+		from /Users/owainlewis/Projects/Ruby/jointest/app/other.js
+		*/
+
+		Object.keys = function( obj ) {
+		  var array = new Array();
+		  for ( var prop in obj ) {
+		    if ( obj.hasOwnProperty( prop ) ) {
+		      array.push( prop );
+		    }
+		  }
+		  return array;
+		};
+
+		/*
+		Compiled with Join at 2011-08-28 23:11:02 +0100
+		from /Users/owainlewis/Projects/Ruby/jointest/app/main.js
+		*/
+
+		//Main File
+		//= other.js
+
+		Object.defineProperties = function( obj, props ) {
+		  for ( var prop in props ) {
+		    Object.defineProperty( obj, prop, props[prop] );
+		  }
+		};
+		
+## Known issues
+
+There are a few path issues that I still need to address. Also, relative paths are currently required in the require statements ( //= require /app/main.js etc )

data/test/compiled.js

@@ -0,0 +1,22 @@
+/*
+Compiled with Join at 2011-09-11 18:16:25 +0100
+from /Users/owainlewis/Projects/ruby/Gems/Join/test/include.js
+*/
+
+(function (){
+	
+	/* Include.js */
+		
+}).call(this);
+
+/*
+Compiled with Join at 2011-09-11 18:16:25 +0100
+from /Users/owainlewis/Projects/ruby/Gems/Join/test/index.js
+*/
+
+//= require include.js
+
+
+
+
+

data/test/include.js

@@ -0,0 +1,5 @@
+(function (){
+	
+	/* Include.js */
+		
+}).call(this);

data/test/index.js

@@ -0,0 +1,4 @@
+//= require include.js
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: join
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,31 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
+date: 2011-09-11 00:00:00.000000000Z
 dependencies: []
 description: A Ruby library for joining files together. Principally aimed at joining
   JavaScript modules
 email:
 - owain@owainlewis.com
 executables:
-- join-files
+- join-compile
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Rakefile
-- bin/join-files
+- bin/join-compile
+- index.js
 - join.gemspec
 - lib/join.rb
 - lib/join/concatenate.rb
 - lib/join/process.rb
 - lib/join/version.rb
 - readme.md
+- test/compiled.js
+- test/include.js
+- test/index.js
 homepage: ''
 licenses: []
 post_install_message: 
@@ -55,4 +59,7 @@ signing_key:
 specification_version: 3
 summary: A Ruby library for joining files together. Principally aimed at joining JavaScript
   modules
-test_files: []
+test_files:
+- test/compiled.js
+- test/include.js
+- test/index.js