catapult 0.0.2 → 0.0.3

data/LICENSE

@@ -1,6 +1,4 @@
-Copyright (c) 2012 Alex MacCaw
-
-MIT License
+Copyright (c) 2012 Alex MacCaw (info@eribium.org)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -12,20 +12,31 @@ Catapult is especially useful alongside MVC frameworks like [Spine](http://spine
 
 To generate an app, use:
 
-    catapult new myapp
-    cd myapp
+    $ catapult new myapp
+
+      create  myapp
+      create  myapp/assets/javascripts/app.js
+      create  myapp/assets/stylesheets/app.css
+      create  myapp/browser.json
+      create  myapp/public/index.htm
+
+    $ cd myapp
+
+You'll notice a bunch of files have been created. The convention in Catapult is that any assets under `assets/javascripts` and `assets/stylsheets` will be compiled under the static `public` directory. Your HTML files can reference them there.
 
 Now you can start a catapult server:
 
-    catapult server
+    $ catapult server
+
+And open up the app [in your browser](http://localhost:9292).
 
-Or build the files for deployment:
+You can also build the files for deployment:
 
-    catapult build
+    $ catapult build
 
 Or watch the files for changes, and then automatically build:
 
-    catapult watch
+    $ catapult watch
 
 ## Concatenation
 

data/catapult.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'stylus', '~> 0.6.2'
   gem.add_dependency 'coffee-script', '~> 2.2.0'
   gem.add_dependency 'thor', '~> 0.15.2'
-  gem.add_dependency 'thin', '~> 1.3.1'
+  gem.add_dependency 'thin'
 end

data/example/Rakefile

@@ -0,0 +1,8 @@
+require 'catapult'
+
+namespace :assets do
+  desc "Compile all the assets to ./public/assets."
+  task :precompile do
+    Catapult::CLI.new.build
+  end
+end

data/lib/catapult/cli.rb

@@ -12,14 +12,16 @@ module Catapult
       File.expand_path('../../..', __FILE__)
     end
 
-    desc 'build', 'Build project'
+    desc 'build [asset1 asset2..]', 'Build project'
 
-    def build
-      target = Pathname('./public/assets')
+    method_option :target, :aliases => '-t', :desc => 'Directory to compile assets to'
+
+    def build(*assets)
+      target = Pathname(options[:target] || './public/assets')
 
       say "Building: #{Catapult.root}"
 
-      Catapult.environment.each_logical_path do |logical_path|
+      Catapult.environment.each_logical_path(assets) do |logical_path|
         if asset = Catapult.environment.find_asset(logical_path)
           filename = target.join(logical_path)
           FileUtils.mkpath(filename.dirname)
@@ -40,12 +42,14 @@ module Catapult
       )
     end
 
-    desc 'watch', 'Build project whenever it changes'
+    desc 'watch [asset1 asset2..]', 'Build project whenever it changes'
+
+    method_option :target, :aliases => '-t', :desc => 'Directory to compile assets to'
 
-    def watch
+    def watch(*assets)
       say "Watching: #{Catapult.root}"
 
-      build
+      build(*assets)
 
       paths = Catapult.environment.paths
       paths = paths.select {|p| File.exists?(p) }
@@ -59,4 +63,4 @@ module Catapult
       directory('templates/app', name)
     end
   end
-end
+end

data/lib/catapult/version.rb

@@ -1,3 +1,3 @@
 module Catapult
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/catapult.rb

@@ -1,8 +1,7 @@
 require 'pathname'
 require 'sprockets'
 require 'sprockets/commonjs'
-require 'stylus/tilt'
-require 'stylus/import_processor'
+require 'stylus'
 require 'coffee_script'
 
 module Catapult
@@ -25,9 +24,7 @@ module Catapult
       env.append_path(root.join('vendor', 'assets', 'stylesheets'))
 
       env.append_path(root.join('browser_modules'))
-
-      env.register_engine '.styl', Tilt::StylusTemplate
-      env.register_preprocessor 'text/css', Stylus::ImportProcessor
+      Stylus.setup(env)
 
       env
     end

data/templates/app/Rakefile

@@ -0,0 +1,8 @@
+require 'catapult'
+
+namespace :assets do
+  desc "Compile all the assets to ./public/assets."
+  task :precompile do
+    Catapult::CLI.new.build
+  end
+end

data/templates/app/public/index.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <link rel="stylesheet" href="/assets/app.css" type="text/css">
-  <script src="/assets/app.js"></script>
+  <link rel="stylesheet" href="assets/app.css" type="text/css">
+  <script src="assets/app.js"></script>
 </head>
 <body>
   <p>Hello world!</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catapult
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70125153064060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70125153064060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70125153063440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +37,31 @@ dependencies:
         version: 2.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70125153063440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: sprockets-commonjs
-  requirement: &70125153062900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.6.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70125153062900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.6.pre
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &70125153062320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70125153062320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: stylus
-  requirement: &70125153061740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70125153061740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70125153061200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70125153061200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70125153060620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,18 +117,28 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *70125153060620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70125153060040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125153060040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Sprockets/Rack build tool
 email:
 - maccman@gmail.com
@@ -114,6 +154,7 @@ files:
 - Rakefile
 - bin/catapult
 - catapult.gemspec
+- example/Rakefile
 - example/assets/javascripts/app.js
 - example/assets/stylesheets/app.css
 - example/browser.json
@@ -122,6 +163,7 @@ files:
 - lib/catapult/cli.rb
 - lib/catapult/try_static.rb
 - lib/catapult/version.rb
+- templates/app/Rakefile
 - templates/app/assets/javascripts/app.js
 - templates/app/assets/stylesheets/app.css
 - templates/app/browser.json
@@ -146,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easily build JavaScript projects