jbundle 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbundle (0.0.3)
+    jbundle (0.0.4)
       closure-compiler
 
 GEM

data/README.md

@@ -55,14 +55,16 @@ This will write the following files:
     'dist/1.6/text.txt'
     
 Or you can build a single bundle/file dinamically (ie. for testing, or for serving and caching dinamically)
-
+    
+    JBundle.config_from_file './JFile'
     JBundle.build('foo.js').src
     
 Or
 
+    JBundle.config_from_file './JFile'
     JBundle.build('foo.js').min
     
-You can bundle licenses in bundles. Licenses will not be minified even if though they end up as part of minified files
+You can bundle licenses in bundles. Licenses will not be minified even though they end up being part of minified files
 
     bundle 'foo2.js' do
       license 'license.txt'

data/bin/jbundle

@@ -2,11 +2,9 @@ require 'jbundle'
 
 JBUNDLE_FILE = 'Jfile'
 
-if ::File.exists?(JBUNDLE_FILE)
-  JBundle.run( ::File.read(JBUNDLE_FILE) )
-elsif ::File.exists?('JBundlefile')
-  puts "JBundlefile is deprecated. Please rename it to #{JBUNDLE_FILE}. Sorry! I'll run it this time anyway."
-  JBundle.run( ::File.read('JBundlefile') )
-else
-  puts "You need to define ./#{JBUNDLE_FILE}"
+begin
+  JBundle.config_from_file(JBUNDLE_FILE)
+  JBundle.write!
+rescue JBundle::NoJFileError => boom
+  puts boom.message
 end

data/lib/jbundle/version.rb

@@ -1,3 +1,3 @@
 module JBundle
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/jbundle.rb

@@ -7,6 +7,8 @@ require 'jbundle/writer'
 
 module JBundle
   
+  class NoJFileError < StandardError;end
+  
   class << self
     
     attr_accessor :logger
@@ -43,9 +45,10 @@ module JBundle
       Builder.new(config).build_one found
     end
     
-    def run(content)
-      config.instance_eval content
-      write!
+    def config_from_file(file)
+      raise NoJFileError, "You need to define #{file}" unless ::File.exists?(file)
+      reset!
+      config.instance_eval( ::File.read(file), file )
     end
     
   end

data/spec/JFile

@@ -0,0 +1,23 @@
+version '1.6.1'
+
+src_dir ::File.dirname(__FILE__) + '/test_src'
+target_dir DIST
+
+bundle 'foo.js' do
+  file 'file1.js'
+  file 'file2.js'
+end
+
+bundle 'foo2.js' do
+  license 'license.txt'
+  file 'file3.js'
+  file 'file4.js'
+end
+
+file 'file4.js'
+
+file 'text.txt'
+
+filter do |src, config|
+  src.gsub!(/<VERSION>/, config.version)
+end

data/spec/jbundle_spec.rb

@@ -6,35 +6,7 @@ DIST = File.dirname(__FILE__)+'/dist'
 describe "JBundle" do
   
   before do
-    
-    JBundle.reset!
-    JBundle.config do
-      version '1.6.1'
-      
-      src_dir File.dirname(__FILE__) + '/test_src'
-      target_dir DIST
-      
-      bundle 'foo.js' do
-        file 'file1.js'
-        file 'file2.js'
-      end
-      
-      bundle 'foo2.js' do
-        license 'license.txt'
-        file 'file3.js'
-        file 'file4.js'
-      end
-      
-      file 'file4.js'
-      
-      file 'text.txt'
-      
-      filter do |src, config|
-        src.gsub!(/<VERSION>/, config.version)
-      end
-      
-    end
-    
+    JBundle.config_from_file ::File.join(::File.dirname(__FILE__),'JFile')
   end
   
   it 'should have a version' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jbundle
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ismael Celis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -03:00
+date: 2011-01-19 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/jbundle/version.rb
 - lib/jbundle/writer.rb
 - spec/.rspec
+- spec/JFile
 - spec/jbundle_spec.rb
 - spec/spec_helper.rb
 - spec/test_src/file1.js