jbundle 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,20 +1,23 @@
 PATH
   remote: .
   specs:
-    jbundle (0.0.8)
+    jbundle (0.0.10)
       closure-compiler
+      rack
+      thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    closure-compiler (0.3.3)
+    closure-compiler (1.1.1)
+    rack (1.3.0)
     rspec (1.3.1)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  closure-compiler
   jbundle!
   rspec (= 1.3.1)

data/README.md

@@ -155,7 +155,22 @@ If you want a prerelease not to overwrite the previous point release, suffix it
 
     version '1.0.1-pre'
     
+## Test server
 
+JBundle command-line comes with a built-in Rack server that makes it easy to test you JavaScript bundles as you develop them.
+
+    jbundle server
+    
+    Starting test server on http://localhost:5555. Available bundles:
+    - /foo.js
+    
+That serves bundles defined in your JFile in port 5555. Pass the -p option for a different port.
+
+Learn more about the JBundle command-line with
+
+    jbundle help # all commands
+    jbundle help server # server command options
+    
 ## TODO
 
 - DRY up stuff, better error handling for missing config

data/bin/jbundle

@@ -1,10 +1,3 @@
 require 'jbundle'
 
-JBUNDLE_FILE = 'Jfile'
-
-begin
-  JBundle.config_from_file(JBUNDLE_FILE)
-  JBundle.write!
-rescue JBundle::NoJFileError => boom
-  puts boom.message
-end
+JBundle::CommandLine.start

data/jbundle.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", '1.3.1'
   s.add_dependency 'closure-compiler'
+  s.add_dependency 'thor'
+  s.add_dependency 'rack'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/jbundle/command_line.rb

@@ -0,0 +1,51 @@
+require 'thor'
+module JBundle
+  
+  class CommandLine < Thor
+    default_task :bundle
+    
+    map "s" => :server
+    map "-v" => :version
+
+    desc "bundle", "Minify and bundle bundle declarations into dist directory"
+    def bundle
+      begin
+        JBundle.config_from_file(JBundle::JFILE)
+        JBundle.write!
+      rescue JBundle::NoJFileError => boom
+        puts boom.message
+      end
+    end
+    
+    desc 'server', 'Start test rack server on port 5555'
+    method_option :port, :default => "5555", :aliases => "-p"
+    def server
+      require 'rack'
+      JBundle.config_from_file(JBundle::JFILE)
+      puts "Starting test server on http://localhost:#{options[:port]}. Available bundles:"
+      JBundle.config.bundles_and_files.each do |f|
+        puts "- /#{f.name}"
+      end
+
+      handler = Rack::Handler.default
+      downward = false
+      ['INT', 'TERM', 'QUIT'].each do |signal|
+        trap(signal) do
+          exit! if downward
+          downward = true
+          handler.shutdown if handler.respond_to?(:shutdown)
+          Process.wait rescue nil
+          puts 'Shutting down test server'
+          exit!
+        end
+      end
+      handler.run JBundle::Server.new, {:Port => options[:port]}
+    end
+    
+    desc 'version', 'Print installed JBundle version'
+    def version
+      puts JBundle::VERSION
+    end
+
+  end
+end

data/lib/jbundle/server.rb

@@ -0,0 +1,28 @@
+module JBundle
+  
+  class Server
+    
+    
+    def initialize(jfile = JBundle::JFILE)
+      @jfile = jfile
+    end
+    
+    # Configure JBundle on every request. 
+    # Expensive but allows for reloading changes to JFile
+    def call(env)
+      bundle_name = env['PATH_INFO'].sub('/', '')
+      begin
+        JBundle.config_from_file(@jfile)
+        [200, {'Content-Type' => 'application/x-javascript'}, [JBundle.build(bundle_name).src]]
+      rescue NoBundleError => boom
+        p = bundle_name == '' ? '[bundle_name].js' : bundle_name
+        [404, {'Content-Type' => 'text/plain'}, ["No bundle defined. Try defining /#{p} in your JFile"]]
+      rescue NoJFileError => boom
+        [404, {'Content-Type' => 'text/plain'}, [boom.message]]
+      end
+      
+    end
+
+  end
+  
+end

data/lib/jbundle/version.rb

@@ -1,3 +1,3 @@
 module JBundle
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/jbundle.rb

@@ -4,10 +4,16 @@ require 'jbundle/file'
 require 'jbundle/bundle'
 require 'jbundle/builder'
 require 'jbundle/writer'
+require 'jbundle/command_line'
+require 'jbundle/server'
+require 'jbundle/version'
 
 module JBundle
   
+  JFILE = 'Jfile'
+  
   class NoJFileError < StandardError;end
+  class NoBundleError < StandardError;end
   
   class << self
     
@@ -45,7 +51,7 @@ module JBundle
     
     def build(name)
       found = config.bundles_and_files.detect {|f| f.name == name}
-      raise "No bundle or file found with name #{name}" unless found
+      raise NoBundleError, "No bundle or file found with name #{name}" unless found
       Builder.new(config).build_one found
     end
     

data/spec/jbundle_spec.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'fileutils'
 
-DIST = File.dirname(__FILE__)+'/dist'
-
 describe "JBundle" do
   
   before do

data/spec/server_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe "JBundle::Server" do
+  
+  before do
+    f = File.join(File.expand_path(File.dirname(__FILE__)), 'JFile')
+    @server = JBundle::Server.new(f)
+  end
+  
+  describe '#call' do
+    before do      
+      @response = @server.call({'PATH_INFO' => '/foo.js'})
+    end
+    
+    it 'should be 404 if no JFile found' do
+      s = JBundle::Server.new("doesn-not-exist")
+      r = s.call({'PATH_INFO' => '/foo.js'})
+      r[0].should == 404
+    end
+    
+    it 'should be 200 OK' do
+      @response[0].should == 200
+    end
+    
+    it 'should be a javascript response' do
+      @response[1]['Content-Type'].should == 'application/x-javascript'
+    end
+    
+    it 'should return content for given bundle' do
+      @response[2].should == [JBundle.build('foo.js').src]
+    end
+    
+    it 'should be 404 when no bundle found' do
+      r = @server.call({'PATH_INFO' => '/nonexisting.js'})
+      r[0].should == 404
+    end
+    
+  end
+  
+end

data/spec/spec_helper.rb

@@ -4,6 +4,9 @@ Bundler.setup
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+DIST = File.dirname(__FILE__)+'/dist'
+
 require 'jbundle'
 begin
   require 'spec'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jbundle
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors: 
 - Ismael Celis
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +01:00
+date: 2011-05-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
         version: 1.3.1
   type: :development
   version_requirements: *id002
@@ -58,12 +43,31 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: Writes versioned, bundled and minified javascript files and dependencies
 email: 
 - ismaelct@gmail.com
@@ -84,13 +88,16 @@ files:
 - lib/jbundle.rb
 - lib/jbundle/builder.rb
 - lib/jbundle/bundle.rb
+- lib/jbundle/command_line.rb
 - lib/jbundle/config.rb
 - lib/jbundle/file.rb
+- lib/jbundle/server.rb
 - lib/jbundle/version.rb
 - lib/jbundle/writer.rb
 - spec/.rspec
 - spec/JFile
 - spec/jbundle_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/test_src/file1.js
 - spec/test_src/file2.js
@@ -114,25 +121,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: jbundle
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Good for releasing javascript libraries composed of many files. Writes files apt for deploying to CDNs.