cup 0.0.3 → 0.0.4

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
 pkg/*
+development

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    cup (0.0.2)
-      activemodel
+    cup (0.0.4)
       coffee-script
+      rack (= 1.3.3)
       rake
       sass
       sinatra
@@ -16,15 +16,8 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
     backports (2.3.0)
-    builder (3.0.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -35,7 +28,6 @@ GEM
     eventmachine (0.12.10)
     execjs (1.2.9)
       multi_json (~> 1.0)
-    i18n (0.6.0)
     libv8 (3.3.10.2)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -105,7 +97,6 @@ PLATFORMS
 
 DEPENDENCIES
   cup!
-  rack (= 1.3.3)
   rack-test
   rspec
   ruby-debug19

data/cup.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Cup::VERSION
   s.authors     = ['Sam Taylor']
   s.email       = ['sjltaylor@gmail.com']
-  s.homepage    = ''
+  s.homepage    = 'https://github.com/sjltaylor/cup'
   s.summary     = 'ruby based tools for developing javascript libraries'
   # s.description = %q{TODO: Write a gem description}
 
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'thor'
-  s.add_runtime_dependency 'activemodel'
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'therubyracer'
   s.add_runtime_dependency 'uglifier'
@@ -29,12 +28,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'sass'
   s.add_runtime_dependency 'coffee-script'
   s.add_runtime_dependency 'yard'
+  s.add_runtime_dependency 'rack', '1.3.3'
 
   s.add_development_dependency 'ruby-debug19'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'shoulda'
   s.add_development_dependency 'statemachine'
-  s.add_development_dependency 'rack', '=1.3.3'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'thin'
   s.add_development_dependency 'sinatra-reloader'

data/lib/cup/builder.rb

@@ -3,7 +3,7 @@ require 'cup/noop_shell'
 
 module Cup
   class Builder
-    extend FileUtils
+    include FileUtils
 
     attr_reader :directory
 
@@ -75,7 +75,7 @@ module Cup
       mkdir build_directory unless Dir.exists?(build_directory)
       file = File.open(output_file, 'w')
 
-      file.write(license_header)
+      file.write(licence_header)
 
       input_files.each do |input_file|
         file.write(';')
@@ -95,9 +95,9 @@ module Cup
     def default_options
       { :cli => NoopShell }
     end
-    def license_header
-      license = File.read(directory.cupfile.license) rescue nil
-      license.nil? ? '' : "/*\n#{license}\n*/"
+    def licence_header
+      licence = File.read(directory.cupfile.licence) rescue nil
+      licence.nil? ? '' : "/*\n#{licence}\n*/"
     end
     def input_files
       directory.javascripts :build_input

data/lib/cup/command_line.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] ||= File.exists?(File.expand_path('../../../development', __FILE__)) ? 'development' : 'production'
+
 require 'thor'
 require 'pathname'
 require 'cup'
@@ -33,7 +35,7 @@ Cup.define do |cup|
 
   name '#{name}'
   version '0.0.1'
-  license 'license.txt'
+  licence 'licence.txt'
 
   javascripts do
     vendor 'jasmine.js', :*
@@ -63,8 +65,8 @@ CUPFILE
         File.exists?(root + 'Cupfile')
       end
 
-      def license_file
-        root + 'license.txt'
+      def licence_file
+        root + 'licence.txt'
       end
 
       def get_jquery
@@ -72,14 +74,14 @@ CUPFILE
         return jquery if $?.exitstatus == 0
       end
 
-      def get_license
+      def get_licence
         <<-LICENSE
   Copyright (C) #{Time.now.year} by #{ENV['USER'] || 'THE_MAN'}
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  to use, copy, modify, merge, publish, distribute, sublicence, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
@@ -144,7 +146,7 @@ LICENSE
 
       create_file helper.cupfile, helper.cupfile_default_content(name)
 
-      create_file helper.license_file, helper.get_license
+      create_file helper.licence_file, helper.get_licence
 
       jquery = helper.get_jquery
 
@@ -169,14 +171,14 @@ LICENSE
       Cup.build! :cli => self
     end
 
-    desc "concatenate", 'builds to STDOUT'
+    desc "concatenate", 'concatenates to STDOUT'
     def concatenate
-      $stdout.write Cup.concatenate!
+      $stdout.puts Cup.concatenate!
     end
 
-    desc "minify", 'builds to STDOUT'
+    desc "minify", 'minifies to STDOUT'
     def minify
-      $stdout.write Cup.minify!
+      $stdout.puts Cup.minify!
     end
 
     desc "server [PORT]", 'Starts a sinatra app which serves spec runners etc.'

data/lib/cup/cupfile.rb

@@ -1,15 +1,9 @@
-require 'active_model'
-
 module Cup
   class Cupfile
-    include ActiveModel::Validations
     class CupfileError < RuntimeError; end
 
     attr_accessor :path
-    attr_reader :path, :name, :version, :license, :before_build, :after_build, :uglifier_options
-
-    validates_presence_of :name, :version, :path
-    validate :license_file_exists?
+    attr_reader :path, :validation_errors, :name, :version, :licence, :before_build, :after_build, :uglifier_options
 
     def initialize path
 
@@ -18,7 +12,8 @@ module Cup
       @uglifier_options = {}
       @before_build = lambda {}
       @after_build = lambda {}
-      
+      @validation_errors = []
+
       %w{vendor spec lib src}.each do |dir|
         set_javascript_patterns_for dir.to_sym, :*
       end
@@ -31,8 +26,27 @@ module Cup
       @javascripts
     end
 
+    def valid?
+      @validation_errors = []
+
+      validation_error 'cupfile error, path not specified' if path.nil?
+      validation_error 'name is required' if name.nil? or name.strip.size == 0
+      validation_error 'version is require and must be of the form X.Y.Z where X, Y and Z are numbers' unless version =~ /\d+\.\d+\.\d+/
+      validation_error "licence file '#{licence}' does not exist" unless licence_file_exists?
+
+      @validation_errors.empty?
+    end
+
+    def error_messages(join=', ')
+      @validation_errors.join join
+    end
+
     private
 
+    def validation_error(msg)
+      @validation_errors << msg
+    end
+
     def set_javascript_patterns_for subdir, *patterns
 
       current_directory = File.dirname(File.expand_path(self.path))
@@ -56,11 +70,8 @@ module Cup
       end.flatten.compact.uniq
     end
 
-    def license_file_exists?
-      unless license.nil? or path.nil?
-        license_path = "#{File.dirname(File.expand_path(path))}/#{license}"
-        errors.add :license, "#{license} is not a valid license file" unless File.exist?(license_path) and not File.directory?(license_path)
-      end
+    def licence_file_exists?
+      licence.nil? or path.nil? or File.file?("#{File.dirname(path.expand_path)}/#{licence}")
     end
 
     class DSL < BasicObject
@@ -68,7 +79,7 @@ module Cup
 
       ## DSL members
       ## setters
-      %W{version name license uglifier_options}.each do |m|
+      %W{version name licence uglifier_options}.each do |m|
         define_method m do |value|
           @cupfile.instance_variable_set "@#{m}", value
         end

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.errors.full_messages}")
+        raise Cup::Cupfile::CupfileError.new("Cupfile not valid: #{@cupfile.path.to_s}\n#{@cupfile.error_messages("\n")}")
       end
 
       @cupfile
@@ -46,9 +46,9 @@ module Cup
       opts[:relative] ? output : "#{self.path}/#{output}"
     end
 
-    def license(opts={})
-      license = "#{cupfile.license}"
-      opts[:relative] ? license : "#{self.path}/#{license}"
+    def licence(opts={})
+      licence = "#{cupfile.licence}"
+      opts[:relative] ? licence : "#{self.path}/#{licence}"
     end
 
     def javascripts scheme=nil

data/lib/cup/server/app.rb

@@ -15,13 +15,14 @@ begin
 rescue LoadError
 end
 
+ENV['RACK_ENV'] ||= File.exists?(File.expand_path('../../../../development', __FILE__)) ? 'development' : 'production'
+
 module Cup
   module Server
     class App < Sinatra::Base
-
       use Middleware
 
-      configure(:development) do
+      configure(:development, :test) do
         require 'ruby-debug'
         require 'sinatra/reloader'
         register Sinatra::Reloader

data/lib/cup/version.rb

@@ -1,3 +1,3 @@
 module Cup
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/cup/builder_spec.rb

@@ -64,20 +64,20 @@ describe Cup::Builder do
       File.should exist(output_file)
     end
 
-    context 'when a license file is specified' do
+    context 'when a licence file is specified' do
 
-      let(:license){"\n\nLICENSE\nFILE\nCONTENT\n\n\n"}
-      let(:license_comment) {"/*\n" + license + "\n*/"}
+      let(:licence){"\n\nLICENSE\nFILE\nCONTENT\n\n\n"}
+      let(:licence_comment) {"/*\n" + licence + "\n*/"}
 
       before :each do
         cupfile = directory.cupfile
-        cupfile.stub(:license).and_return('license.txt')
-        File.should_receive(:read).with(/.*license\.txt$/).and_return(license)
+        cupfile.stub(:licence).and_return('licence.txt')
+        File.should_receive(:read).with(/.*licence\.txt$/).and_return(licence)
       end
 
-      it 'should prepend the license unaltered to the output' do
+      it 'should prepend the licence unaltered to the output' do
         process_scripts!
-        File.read(output_file).start_with?(license_comment).should be_true
+        File.read(output_file).start_with?(licence_comment).should be_true
       end
     end
 

data/spec/cup/command_line_spec.rb

@@ -113,13 +113,13 @@ describe Cup::CommandLine do
       File.should exist(path + 'vendor' + 'extra_matchers.js')
     end
 
-    it 'should create a license file populated with the year and user as author' do
+    it 'should create a licence file populated with the year and user as author' do
       cli.create test_cup_name
-      path = "#{test_cup_name}/license.txt"
+      path = "#{test_cup_name}/licence.txt"
       File.should exist(path)
-      license = File.read path
-      license.should include Time.now.year.to_s
-      license.should include ENV['USER']
+      licence = File.read path
+      licence.should include Time.now.year.to_s
+      licence.should include ENV['USER']
     end
   end
 

data/spec/cup/cupfile_spec.rb

@@ -42,8 +42,8 @@ describe Cup::Cupfile do
       cupfile.should_not be_valid
     end
 
-    it 'should be invalid if the license file is specified but does not exist' do
-      cupfile.instance_variable_set :@license, 'path/that/is/not/there.txt'
+    it 'should be invalid if the licence file is specified but does not exist' do
+      cupfile.instance_variable_set :@licence, 'path/that/is/not/there.txt'
       cupfile.should_not be_valid
     end
   end
@@ -152,13 +152,13 @@ describe Cup::Cupfile do
     cupfile.name.should == 'mycup'
   end
 
-  it 'should allow a license file to be set' do
+  it 'should allow a licence file to be set' do
 
     Cup::Cupfile::DSL.interpret cupfile do
-      license 'license.txt'
+      licence 'licence.txt'
     end
 
-    cupfile.license.should == 'license.txt'
+    cupfile.licence.should == 'licence.txt'
   end
 
   it 'should allow a before_build block to be set' do

data/spec/cup/directory_spec.rb

@@ -65,14 +65,14 @@ describe Cup::Directory do
     end
   end
 
-  describe '#license' do
+  describe '#licence' do
 
-    it 'should be absolute path to license.txt' do
-      directory.license.should == File.expand_path("#{directory.path}/license.txt")
+    it 'should be absolute path to licence.txt' do
+      directory.licence.should == File.expand_path("#{directory.path}/licence.txt")
     end
 
-    it 'should give a path relative to the license if :relative => true is passed' do
-      directory.license(:relative => true).should == "license.txt"
+    it 'should give a path relative to the licence if :relative => true is passed' do
+      directory.licence(:relative => true).should == "licence.txt"
     end
   end
 

data/spec/support/macros.rb

@@ -29,7 +29,7 @@ module Support
 
       touch "#{test_example_cup_name}/build/#{test_example_cup_name}.js"
       touch "#{test_example_cup_name}/build/#{test_example_cup_name}.min.js"
-      touch "#{test_example_cup_name}/license.txt"
+      touch "#{test_example_cup_name}/licence.txt"
 
       %w[vendor lib spec src].each do |dir|
         path = "#{test_example_cup_name}/#{dir}"

data/views/layout.slim

@@ -16,8 +16,8 @@ html
 
   body
 
-
     #cup_header
+      
       nav
         ul
           li
@@ -31,7 +31,7 @@ html
             ' spec:
             a href='/spec' src
             ',
-            a href='/spec/concatenated' concatenated
+            a href='/spec/built' built
             ',
             a href='/spec/minified' minified
             ',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cup
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152333380 !ruby/object:Gem::Requirement
+  requirement: &2152670420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152333380
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: &2152332760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152332760
+  version_requirements: *2152670420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152332060 !ruby/object:Gem::Requirement
+  requirement: &2152669960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152332060
+  version_requirements: *2152669960
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2152331500 !ruby/object:Gem::Requirement
+  requirement: &2152669300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152331500
+  version_requirements: *2152669300
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2152330900 !ruby/object:Gem::Requirement
+  requirement: &2152668620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152330900
+  version_requirements: *2152668620
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152330100 !ruby/object:Gem::Requirement
+  requirement: &2152667980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152330100
+  version_requirements: *2152667980
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &2152329460 !ruby/object:Gem::Requirement
+  requirement: &2152667280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152329460
+  version_requirements: *2152667280
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152328720 !ruby/object:Gem::Requirement
+  requirement: &2152666560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152328720
+  version_requirements: *2152666560
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2152327820 !ruby/object:Gem::Requirement
+  requirement: &2152665880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152327820
+  version_requirements: *2152665880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152327240 !ruby/object:Gem::Requirement
+  requirement: &2152665340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152327240
+  version_requirements: *2152665340
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2152664660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152664660
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2152326380 !ruby/object:Gem::Requirement
+  requirement: &2152663960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152326380
+  version_requirements: *2152663960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152325200 !ruby/object:Gem::Requirement
+  requirement: &2152663120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152325200
+  version_requirements: *2152663120
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152324400 !ruby/object:Gem::Requirement
+  requirement: &2152242940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152324400
+  version_requirements: *2152242940
 - !ruby/object:Gem::Dependency
   name: statemachine
-  requirement: &2152320260 !ruby/object:Gem::Requirement
+  requirement: &2152242020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,21 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152320260
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2152319180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: *2152319180
+  version_requirements: *2152242020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152318620 !ruby/object:Gem::Requirement
+  requirement: &2152238560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152318620
+  version_requirements: *2152238560
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2152317800 !ruby/object:Gem::Requirement
+  requirement: &2152237380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152317800
+  version_requirements: *2152237380
 - !ruby/object:Gem::Dependency
   name: sinatra-reloader
-  requirement: &2152317020 !ruby/object:Gem::Requirement
+  requirement: &2152235940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152317020
+  version_requirements: *2152235940
 description: 
 email:
 - sjltaylor@gmail.com
@@ -260,7 +249,7 @@ files:
 - views/root.slim
 - views/spec.slim
 - views/visual.slim
-homepage: ''
+homepage: https://github.com/sjltaylor/cup
 licenses: []
 post_install_message: 
 rdoc_options: []