cup 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cup (0.0.4)
+    cup (0.0.6)
       coffee-script
       rack (= 1.3.3)
       rake

data/README.markdown

@@ -0,0 +1,127 @@
+# Cup
+
+INSERT A PICTURE OF A CUP
+
+Command lines tools and a web application to help in developing javascript libraries and applications independently of anything else.
+
+
+## Command Line App
+
+Output from `cup help`:
+
+    Tasks:
+      cup build          # builds and minifies (with uglifier) into ./build/
+      cup concatenate    # concatenates to STDOUT
+      cup create NAME    # Creates a new directory structure with the specified name. Can also be called like: cup <name> [options]
+      cup help [TASK]    # Describe available tasks or one specific task
+      cup ify            # cupifys the current directory, creating a Cupfile etc.
+      cup minify         # minifies to STDOUT with uglifier
+      cup rackup         # Create a config.ru. Do this if you want to use powder
+      cup server [PORT]  # Starts a sinatra app which serves spec runners etc.
+      cup version        # The version of cup and the version of the Cup project in this directory if a Cupfile exists
+
+
+
+### The create Command
+
+This command produces a folder containing:
+
+* vendor: for vendor js libraries such as jquery and jasmine which are automatically downloaded. Note, the latest version of jquery is downloaded by default, for jasmine, cup currently downloaded v1.1
+* spec: where you will place you carefully prepared jasmine specs ;)
+* spec/visual: some special case spec (more on this in the Browser App section below)
+* lib: this is where libraries to be included in the build should be placed
+* src: duh.
+* Cupfile: a file which is used to describe the cup project (more in the Cupfile section below)
+* licence.txt: A default open source licence
+
+
+## Cupfile
+
+Sample Cupfile (ruby) with comments:
+
+    Cup.define do
+
+      name 'my project' # MUST be a valid file name
+      version '0.0.1' # must be of the form X.Y.Z where X, Y and Z are numbers
+      licence 'MIT.txt'
+
+      javascripts do
+
+        vendor 'only_one.js' # <-- no :* symbol means only those explicitly listed scripts will be loaded
+
+        spec 'path/within/spec/dir.js', :* # <-- :* symbol means "all others"
+
+        # if lib load order was not explicitly declared cup defaults to the equivalent:
+
+        lib :*
+
+        src [
+          'an.js',
+          'array.js',
+          'can.js',
+          'also.js',
+          'be.js',
+          'used.js',
+          'so/can/glob-like/patterns/**/*.js'] # happily, patterns and arrays can be used too.
+      end
+
+      uglifier_options :mangle => true # uglifier defaults can be overriden
+
+      before_build do
+        # whatever you want
+      end
+
+      after_build do
+        # whatever you want
+      end
+    end
+
+Note: Multiple inclusions of the same javascript result in the omission of all but the first reference
+
+## Browser App
+
+* root: an overview of the project including links to build output and a file list for the project
+* debug: a page on which the src javascripts and vendor javascripts are loaded but no specs, good for debugging and experimenting with your code in the console
+* empty: the same as debug, but a completely empty page (no cup app header or css). This is for debugging UI components withoutany interference from the stylesheets or controls in the cup application itself.
+* src: run specs on the lib and src files
+* concatenated: run specs on the concatenated version of build output
+* minifed: run specs on the minified version of the build output
+* visual: exercise visual specs (see below)
+
+
+The browser application includes Rack Middleware that acts as a directory server for all paths that are not routes in the main application. For example: `http://<host>:<port>/lib` will serve a directory listing for the lib folder.
+
+Every page on the browser application builds the javascripts. An error page is displayed to indicate the build failed and the browser is redirected to a page that loads lib and src files so that their syntax can be checked in Web Inspector or Firebug.
+
+### Visual Specs
+
+Visual specs help to facilitate the visual verifcation of behaviour which maybe required to support automated specs when developing UI components. Examples of visual spec criteria:
+
+* An animation doesn't flicker
+* A the colours scheme works
+* A slider control is responsive when rapidly changing its position
+
+To create a visual spec, add a slim template in the `spec/visual` directory. Any directory structure within `spec/visual` may be used to organise visual specs as you see fit. An index of available visual specs is available in the browser app.
+
+Each slim template under `spec/visual` is a partial and will be injected into the body of a page with the src, lib and vendor javascript loaded in the order specified by the Cupfile. 
+
+
+Note: No style sheets are automatically loaded for visual specs.
+Note: No javascripts are loaded from the `spec/visual` directory unless explicitly reference in the Cupfile.
+
+
+### Javascripts load order, stylesheets and the Cupfile
+
+All javascripts and stylesheets are automatically included with the exception of javascripts within the spec/visual directory.
+SASS is automatically processed. The automatic loading of stylesheets cannot be overridden.
+The loading of javascripts can be controlled using the Cupfile with the following constraint...
+
+Javascripts are loaded from these paths in this order:
+
+1. vendor
+2. spec (only on pages which run specs)
+3. lib
+4. src
+
+Build output is referenced instead of lib and src on the relevant pages (such as when running spec on minifed build output). Only lib and src (in that order) are considered build input.
+

data/TODO

@@ -1,13 +1,3 @@
-> RUN every command line task
-> VISIT every server page
-
->> rebuild js-core-ext (rename to js-core-ext), eventify, z, superview
-
-> INSPECT concatenated and minified output
-
-> README
----- Later ----
-
-Rails app integration
-  * integrate with the jasmine-rails gem to run specs on the command line
-  * integrate with the asset pipeline
+> README.markdown needs proofing, update the gemspec description and summary
+> TODO: ICON
+> download jasmine to spec/env

data/js/extra_matchers.js

@@ -1,7 +1,10 @@
 /*
 
+This file will be overwritten by 'cup ify' command
+
 These jasmine matchers are included by default when a project is created with cup.
 
+
 */
 beforeEach(function() {
   this.addMatchers({
@@ -12,18 +15,10 @@ beforeEach(function() {
       return this.actual instanceof ctor;
     },
     toContain: function (a) {
-      return this.actual.contains(a);
+      return !!~this.actual.indexOf(a);
     },
     toBeEmpty: function () {
       return this.actual.isEmpty();
-    },
-    toThrowAnError: function () {
-      try {
-        this.actual()
-      } catch (e) {
-        return e instanceof Error;
-      }
-      return false;
     }
   });
 });

data/lib/cup/command_line.rb

@@ -38,7 +38,7 @@ Cup.define do |cup|
   licence 'licence.txt'
 
   javascripts do
-    vendor 'jasmine.js', :*
+    spec 'env/jasmine.js', 'env/jasmine-html.js', :*
   end
 
 end
@@ -46,7 +46,7 @@ CUPFILE
       end
 
       def standard_directories
-        %w|src lib vendor spec spec/visual|.map {|dir| root + dir}
+        %w|src lib vendor spec spec/visual spec/env|.map {|dir| root + dir}
       end
 
       def jquery_file
@@ -54,7 +54,7 @@ CUPFILE
       end
 
       def extra_matchers_file
-        root + 'vendor' + 'extra_matchers.js'
+        root + 'spec/env' + 'extra_matchers.js'
       end
 
       def rackup_file
@@ -108,7 +108,7 @@ LICENSE
           set -o errexit # exit if it hits the fan
           set -o nounset # using unset variables is an error
 
-          cd #{root + 'vendor'}
+          cd #{root + 'spec/env'}
 
           curl --silent #{JasmineStandaloneDistributionURL} > jasmine.zip
           unzip jasmine.zip -d jasmine
@@ -130,7 +130,7 @@ LICENSE
     desc "create NAME", "Creates a new directory structure with the specified name. Can also be called like: cup <name> [options]"
     def create(name)
 
-      unless /^[\w-]+$/ =~ name
+      unless valid_cup_name?(name)
         raise "#{name} is not a valid filename (letters, numbers, underscore and dashes only)"
       end
 
@@ -141,32 +141,21 @@ LICENSE
         return
       end
 
-      empty_directory helper.root
-      helper.standard_directories.each {|dir| empty_directory dir}
+      cupify_with helper, name
+    end
 
-      create_file helper.cupfile, helper.cupfile_default_content(name)
+    desc "ify", 'cupifys the current directory, creating a Cupfile etc.'
+    def ify
+      path = current_path
 
-      create_file helper.licence_file, helper.get_licence
+      name = File.basename(path)
+      name = 'new cup' unless valid_cup_name? name
 
-      jquery = helper.get_jquery
-
-      if jquery
-        say_status(:downloaded, "#{Helper::JasmineStandaloneDistributionURL}", :green)
-        create_file helper.jquery_file, jquery
-      else
-        say_status(:failed, "download #{Helper::JQueryURL}", :red)
-      end
-
-      if helper.download_jasmine
-        say_status(:downloaded, "#{Helper::JasmineStandaloneDistributionURL} and unpacked into vendor", :green)
-      else
-        say_status(:failed, "download/unpack #{Helper::JasmineStandaloneDistributionURL}", :red)
-      end
-
-      create_file helper.extra_matchers_file, helper.get_extra_matchers
+      helper = Helper.new(path)
+      cupify_with(helper, name)
     end
 
-    desc "build", 'builds and minifies into ./build/'
+    desc "build", 'builds and minifies (with uglifier) into ./build/'
     def build
       Cup.build! :cli => self
     end
@@ -176,7 +165,7 @@ LICENSE
       $stdout.puts Cup.concatenate!
     end
 
-    desc "minify", 'minifies to STDOUT'
+    desc "minify", 'minifies to STDOUT with uglifier'
     def minify
       $stdout.puts Cup.minify!
     end
@@ -217,6 +206,39 @@ CONFIG_RU
 
   private
 
+    def current_path
+      Pathname.new('.').expand_path
+    end
+    def valid_cup_name? name
+      /^[\w-]+$/ =~ name
+    end
+    def cupify_with helper, name
+
+      empty_directory helper.root
+      helper.standard_directories.each {|dir| empty_directory dir}
+
+      create_file helper.cupfile, helper.cupfile_default_content(name)
+
+      create_file helper.licence_file, helper.get_licence
+
+      jquery = helper.get_jquery
+
+      if jquery
+        say_status(:download, "#{Helper::JQueryURL}", :green)
+        create_file helper.jquery_file, jquery
+      else
+        say_status(:failure, "download #{Helper::JQueryURL}", :red)
+      end
+
+      if helper.download_jasmine
+        say_status(:download, "#{Helper::JasmineStandaloneDistributionURL} unpacked into spec/env", :green)
+      else
+        say_status(:failure, "download/unpack #{Helper::JasmineStandaloneDistributionURL}", :red)
+      end
+
+      create_file helper.extra_matchers_file, helper.get_extra_matchers
+    end
+
     def pwd_helper
       Helper.new(Cup::Directory.current.path.to_s)
     end

data/lib/cup/cupfile.rb

@@ -8,7 +8,7 @@ module Cup
     def initialize path
 
       @path = path
-      @javascripts = {}
+      @javascript_patterns = {}
       @uglifier_options = {}
       @before_build = lambda {}
       @after_build = lambda {}
@@ -23,7 +23,31 @@ module Cup
     end
 
     def javascripts
-      @javascripts
+
+      javascripts = {}
+      current_directory = File.dirname(File.expand_path(self.path))
+      
+      @javascript_patterns.each do |subdir, patterns|
+        javascripts[subdir] = patterns.map do |pattern|
+
+          default_catch_all = pattern == :*
+
+          pattern = '**/*.js' if default_catch_all
+
+          if pattern
+            expanded_pattern = current_directory + "/#{subdir}/#{pattern}"
+            FileList[expanded_pattern].select do |f|
+              if subdir == :spec and f.start_with?(current_directory + "/spec/visual")
+                false
+              else
+                File.extname(f).downcase == '.js'
+              end
+            end
+          end
+        end.flatten.compact.uniq
+      end
+
+      javascripts
     end
 
     def valid?
@@ -49,25 +73,7 @@ module Cup
 
     def set_javascript_patterns_for subdir, *patterns
 
-      current_directory = File.dirname(File.expand_path(self.path))
-
-      @javascripts[subdir] = patterns.map do |pattern|
-
-        default_catch_all = pattern == :*
-
-        pattern = '**/*.js' if default_catch_all
-
-        if pattern
-          expanded_pattern = current_directory + "/#{subdir}/#{pattern}"
-          FileList[expanded_pattern].select do |f|
-            if subdir == :spec and f.start_with?(current_directory + "/spec/visual")
-              false
-            else
-              File.extname(f).downcase == '.js'
-            end
-          end
-        end
-      end.flatten.compact.uniq
+      @javascript_patterns[subdir] = patterns
     end
 
     def licence_file_exists?

data/lib/cup/directory.rb

@@ -26,7 +26,7 @@ module Cup
       @cupfile ||= Cup::Cupfile.new(path + 'Cupfile')
 
       unless @cupfile.valid?
-        raise Cup::Cupfile::CupfileError.new("Cupfile not valid: #{@cupfile.path.to_s}\n#{@cupfile.error_messages("\n")}")
+        fail Cup::Cupfile::CupfileError.new("Cupfile not valid: #{@cupfile.path.to_s}\n#{@cupfile.error_messages("\n")}")
       end
 
       @cupfile

data/lib/cup/server/app.rb

@@ -34,7 +34,7 @@ module Cup
 
       set :server, %w{thin mongrel webrick}
       set :views, gem_root_path('views')
-      set :public_folder, Cup::Directory.current.path.to_s
+      set :public_folder, false #Cup::Directory.current.path.to_s
 
       def view_scope(javascripts_scheme=:debug)
         @view_scope = ViewScope.new self, javascripts_scheme
@@ -129,6 +129,12 @@ module Cup
         view File.read(visual.full_path), :layout => :blank
       end
 
+      get '**/*.sass' do
+        file = File.relative_path(Cup::Directory.current.path, request.path[1..-1])
+        return pass unless File.file? file
+        sass File.read(file)
+      end
+
       not_found do
         view :not_found
       end

data/lib/cup/version.rb

@@ -1,3 +1,3 @@
 module Cup
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/cup/command_line_spec.rb

@@ -4,6 +4,15 @@ require 'fileutils'
 
 describe Cup::CommandLine do
 
+  before :all do
+    @stdout = $stdout
+    $stdout = StringIO.new
+  end
+
+  after :all do
+    $stdout = @stdout
+  end
+
   before :each do
     puts "\n"
   end
@@ -16,56 +25,47 @@ describe Cup::CommandLine do
   let(:test_cup_name) { "test_cup_#{Time.now.utc.to_i}" }
   let(:test_cup_path) { Pathname.new("test_cup_#{Time.now.utc.to_i}") }
 
-  describe '#create' do
+  def remove_test_cup
+    FileUtils.rm_r test_cup_path.expand_path if File.exists? test_cup_path.expand_path
+  end
+  
+  after(:each){ remove_test_cup }
+  
+  share_examples_for :cupifying_a_directory do
 
-    after :each do
-      FileUtils.rm_r test_cup_name if File.exists? test_cup_name
+    before :each do
+      cli.stub(:create_file)
+      cli.stub(:empty_directory)
+      remove_test_cup
     end
 
-    it 'should raise an exception if the name is not a valid filename' do
-      expect {
-        cli.create 'invalid/filename'
-      }.to raise_error
-    end
+    it 'creates a default Cupfile' do
 
-    it 'should not create a new cup dir if one of the same name exists' do
-      Dir.stub(:exists?).and_return(true)
-      cli.create test_cup_name
-      Dir.unstub!(:exists?)
-      File.should_not exist(test_cup_name)
-    end
+      cupfile_path = Pathname.new("#{test_cup_name}/Cupfile").expand_path
 
-    it 'should create a new cup dir' do
-      cli.create test_cup_name
-      File.should exist(test_cup_name)
-    end
+      str = nil
 
-    it 'creates a default Cupfile' do
-      cli.create test_cup_name
-      cupfile_path = "#{test_cup_name}/Cupfile"
-      File.should exist(cupfile_path)
-      File.size(cupfile_path).should be > 0
-    end
+      cli.should_receive(:create_file).with(cupfile_path, instance_of(String)) do |path, string|
+        str = string
+      end
 
-    it "creates empty src, lib and spec and spec/visual directories" do
       cli.create test_cup_name
-      %w(src lib spec spec/visual).each do |dir|
-        dir = test_cup_path + dir
-        File.should exist(dir)
+      str.length.should be > 0
+    end
 
-        File.should be_directory(dir)
+    it "creates empty src, lib and spec and spec/visual spec/env directories" do
 
-        if dir == test_cup_path + 'spec'
-          Dir["#{dir}/*"].count.should == 1
-        else
-          Dir["#{dir}/*"].should be_empty
-        end
+      %w(src lib spec spec/visual spec/env).each do |dir|
+        dir = test_cup_path + dir
+        cli.should_receive(:empty_directory).with(dir.expand_path)
       end
+
+      setup_cup
     end
 
-    it "it downloads jquery into the vendor directory by default" do
-      cli.create test_cup_name
-      File.should exist("#{test_cup_name}/vendor/jquery.min.js")
+    it "it downloads jquery into the vendor directory" do
+      cli.should_receive(:create_file).with(Pathname.new("#{test_cup_name}/vendor/jquery.min.js").expand_path, instance_of(String))
+      setup_cup
     end
 
     it 'should not raise an error if jquery fails to download' do
@@ -77,7 +77,7 @@ describe Cup::CommandLine do
       end
 
       expect {
-        cli.create test_cup_name
+        setup_cup
       }.to_not raise_error
 
       stub_create_helper_downloaders
@@ -92,35 +92,87 @@ describe Cup::CommandLine do
       end
 
       expect {
-        cli.create test_cup_name
+        setup_cup
       }.to_not raise_error
 
       stub_create_helper_downloaders
     end
 
-    it 'should download jasmine into vendor' do
-      cli.create test_cup_name
-      path = Pathname.new(test_cup_name)
+    it 'should download jasmine into spec/env' do
+
+      cli.unstub(:create_file)
 
-      File.should exist(path + 'vendor' + 'jasmine-html.js')
-      File.should exist(path + 'vendor' + 'jasmine.js')
-      File.should exist(path + 'vendor' + 'jasmine.css')
+      setup_cup
+
+      mkdir_p test_cup_path + 'spec/env'
+
+      File.should exist(test_cup_path + 'spec/env' + 'jasmine-html.js')
+      File.should exist(test_cup_path + 'spec/env' + 'jasmine.js')
+      File.should exist(test_cup_path + 'spec/env' + 'jasmine.css')
     end
 
-    it 'should copy extra_matchers.js from the gem into vendor' do
-      cli.create test_cup_name
-      path = Pathname.new(test_cup_name)
-      File.should exist(path + 'vendor' + 'extra_matchers.js')
+    it 'should copy extra_matchers.js from the gem into spec/env' do
+
+      path = test_cup_path + 'spec/env' + 'extra_matchers.js'
+      cli.should_receive(:create_file).with(path.expand_path, instance_of(String))
+      setup_cup
     end
 
     it 'should create a licence file populated with the year and user as author' do
-      cli.create test_cup_name
-      path = "#{test_cup_name}/licence.txt"
-      File.should exist(path)
-      licence = File.read path
+      path = Pathname.new("#{test_cup_name}/licence.txt").expand_path
+
+      licence = nil
+      cli.should_receive(:create_file).with(path, instance_of(String)) do |path, string|
+        licence = string
+      end
+
+      setup_cup
+
       licence.should include Time.now.year.to_s
       licence.should include ENV['USER']
     end
+
+  end
+
+  describe '#ify' do
+
+    before :each do
+      cli.stub(:current_path).and_return(test_cup_path)
+    end
+
+    def setup_cup
+
+      cli.ify
+    end
+
+    it_behaves_like :cupifying_a_directory
+  end
+
+  describe '#create' do
+
+    def setup_cup
+      cli.create test_cup_name
+    end
+
+    it_behaves_like :cupifying_a_directory
+
+    it 'should raise an exception if the name is not a valid filename' do
+      expect {
+        cli.create 'invalid/filename'
+      }.to raise_error
+    end
+
+    it 'should not create a new cup dir if one of the same name exists' do
+      Dir.stub(:exists?).and_return(true)
+      cli.create test_cup_name
+      Dir.unstub!(:exists?)
+      File.should_not exist(test_cup_name)
+    end
+
+    it 'should create a new cup dir' do
+      cli.create test_cup_name
+      File.should directory(test_cup_name)
+    end
   end
 
   describe '#rackup' do

data/spec/cup/cupfile_spec.rb

@@ -76,6 +76,14 @@ describe Cup::Cupfile do
         cupfile.javascripts[dir.to_sym].should_not be_empty
       end
     end
+    
+    it 'should return different results is the filesystem changes' do
+      expect {
+        new_file = Cup::Directory.current.path + 'src' + 'newsrc_file.js'
+        File.should_not exist(new_file)
+        File.open(new_file, 'a') {}
+      }.to change {cupfile.javascripts[:src].count}.by(1)
+    end
   end
 
   describe '#set_javascript_patterns_for' do
@@ -103,13 +111,13 @@ describe Cup::Cupfile do
     end
 
     it 'should expand paths to within their key directory' do
-      filelist = FileList["#{File.expand_path(test_example_cup_path.to_s)}/lib/**/*.js"]
+      filelist = Dir["#{File.expand_path(test_example_cup_path.to_s)}/lib/**/*.js"]
       set_patterns :lib, '**/*.js'
       cupfile.javascripts[:lib].should == filelist
     end
 
     it 'should turn :* into a match-all pattern' do
-      filelist = FileList["#{File.expand_path(test_example_cup_path.to_s)}/lib/**/*.js"]
+      filelist = Dir["#{File.expand_path(test_example_cup_path.to_s)}/lib/**/*.js"]
 
       set_patterns :lib, :*
       cupfile.javascripts[:lib].should == filelist

data/spec/cup/server/app_spec.rb

@@ -7,7 +7,7 @@ describe Cup::Server::App do
   end
 
   it 'should serve public from the cup directory' do
-    app.settings.public_folder.should == Cup::Directory.current.path.to_s
+    app.settings.public_folder.should == false #Cup::Directory.current.path.to_s
   end
 
   it 'should serve views and public from the cup/views directory' do

data/spec/support/stub_helpers.rb

@@ -8,11 +8,11 @@ def stub_create_helper_downloaders
     end
 
     def download_jasmine
-      %x{
-       touch #{root + 'vendor/jasmine.js'}
-       touch #{root + 'vendor/jasmine-html.js'}
-       touch #{root + 'vendor/jasmine.css'}
-      }
+      spec_env = root + 'spec/env'
+      FileUtils.mkdir_p spec_env unless File.directory? spec_env
+      FileUtils.touch spec_env + 'jasmine.js'
+      FileUtils.touch spec_env + 'jasmine-html.js'
+      FileUtils.touch spec_env + 'jasmine.css'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cup
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-10-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2151875340 !ruby/object:Gem::Requirement
+  requirement: &2152089920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151875340
+  version_requirements: *2152089920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151871680 !ruby/object:Gem::Requirement
+  requirement: &2152056960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151871680
+  version_requirements: *2152056960
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2151868660 !ruby/object:Gem::Requirement
+  requirement: &2152051520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151868660
+  version_requirements: *2152051520
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2151867040 !ruby/object:Gem::Requirement
+  requirement: &2151940820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151867040
+  version_requirements: *2151940820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151864480 !ruby/object:Gem::Requirement
+  requirement: &2151931940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151864480
+  version_requirements: *2151931940
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &2151855760 !ruby/object:Gem::Requirement
+  requirement: &2151912880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151855760
+  version_requirements: *2151912880
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2151845540 !ruby/object:Gem::Requirement
+  requirement: &2151895180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151845540
+  version_requirements: *2151895180
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2151841740 !ruby/object:Gem::Requirement
+  requirement: &2151883300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151841740
+  version_requirements: *2151883300
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151834240 !ruby/object:Gem::Requirement
+  requirement: &2151880700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151834240
+  version_requirements: *2151880700
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151828780 !ruby/object:Gem::Requirement
+  requirement: &2151875000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151828780
+  version_requirements: *2151875000
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151827380 !ruby/object:Gem::Requirement
+  requirement: &2151872260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151827380
+  version_requirements: *2151872260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151822720 !ruby/object:Gem::Requirement
+  requirement: &2151870340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151822720
+  version_requirements: *2151870340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151819580 !ruby/object:Gem::Requirement
+  requirement: &2151867340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151819580
+  version_requirements: *2151867340
 - !ruby/object:Gem::Dependency
   name: statemachine
-  requirement: &2151816340 !ruby/object:Gem::Requirement
+  requirement: &2151864300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151816340
+  version_requirements: *2151864300
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2151814200 !ruby/object:Gem::Requirement
+  requirement: &2151852720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151814200
+  version_requirements: *2151852720
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2151810760 !ruby/object:Gem::Requirement
+  requirement: &2151846160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151810760
+  version_requirements: *2151846160
 - !ruby/object:Gem::Dependency
   name: sinatra-reloader
-  requirement: &2151806320 !ruby/object:Gem::Requirement
+  requirement: &2151840500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151806320
+  version_requirements: *2151840500
 description: 
 email:
 - sjltaylor@gmail.com
@@ -212,7 +212,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
-- README.md
+- README.markdown
 - Rakefile
 - TODO
 - bin/cup

data/README.md

@@ -1,86 +0,0 @@
-Cup
-===
-
-## From ruby:
-
-Cup.build
-Cup.cup_name
-Cup.minified
-Cup.concatenated
-Cup.version
-
-
-## CLI helper output
-
-* INSERT HERE
-
-
-## Features
-
-
-* Automatically includes javascripts, easy DSL for customizing their order
- >>>> but NOT from inside spec/visuals1
-
-* can uglify your project `cup build`
-** concatenates lib**/*.js and src/**/*.js  into unminified and minified outputs in ./build
-
-* `cup serve`
-** landing page for all serve capabilities
-** serve specs in concatenated and debug modes
-** serve visual spec index and serve spec/visual/**/*.spec.erb
-** includes all css files in every request
-** sinatra server extendable by add `server do <sinatra endpoints> end` to the Cupfile
-
-   @pages ||= {
-      :root => Page.new.tap do |page|
-        page.path = '/'
-        page.name = 'root'
-        page.template = :root
-        page.description = 'List of available pages'
-      end,
-      :debug => Page.new.tap do |page|
-        page.path = '/debug'
-        page.name = 'debug'
-        page.template = :debug
-        page.description = 'Headed page with lib and src javascript included'
-      end,
-      :empty => Page.new.tap do |page|
-        page.path = '/empty'
-        page.name = 'empty'
-        page.template = :debug
-        page.options[:layout] = false
-        page.description = 'Totally blank page with lib and src javascript included'
-      end,
-      :spec => Page.new.tap do |page|
-        page.path = '/spec'
-        page.name = 'specs'
-        page.template = :spec
-        page.options[:javascripts_scheme] = :spec
-        page.description = 'Run Jasmine specs on lib and src'
-      end,
-      :spec_concatenated => Page.new.tap do |page|
-        page.path = '/spec/concatenated'
-        page.name = 'specs on build output'
-        page.template = :spec
-        page.options[:javascripts_scheme] = :spec_concatenated
-        page.description = 'Run Jasmine specs on the build output'
-      end,
-      :spec_minified => Page.new.tap do |page|
-        page.path = '/spec/minified'
-        page.name = 'specs on minified build output'
-        page.template = :spec
-        page.options[:javascripts_scheme] = :spec_minified
-        page.description = 'Run Jasmine specs on minified build output'
-      end,
-      :spec_visual => Page.new.tap do |page|
-        page.path = '/spec/visual'
-        page.name = 'visual specs'
-        page.template = :spec
-        page.description = 'View available visual specs'
-      end
-    }
-
-* uglified options overridable in Cupfile
-before_build and after_build hooks are available too
-* requires git
-