spade 0.0.6 → 0.0.7

data/lib/spade.rb

@@ -24,7 +24,7 @@ require 'thor'
 require 'v8'
 
 module Spade
-  SPADE_DIR = '.spade'
+  SPADE_DIR = '.spade' # Would be nice to share this with node.js loader
 
   # find the current path with a package.json or .packages or cur_path
   def self.discover_root(cur_path)

data/lib/spade/bundle.rb

@@ -6,7 +6,6 @@
 
 module Spade
   BOOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'));
-  BUILTIN_PACKAGES = File.join File.dirname(BOOT_PATH), 'packages'
 
   module Bundle
     class << self
@@ -24,48 +23,44 @@ module Spade
 
         installed = []
 
+        # Do this to get the Gem.dir right
+        env = Spade::Environment.new
 
-        #TODO: Clean up duplication here
+        # In reverse order of precedence
+        package_dirs = [File.join(env.spade_dir, 'gems')]
+        package_dirs += %w[vendor/cache vendor/packages packages].map{|p| File.join(rootdir, p.split('/')) }
 
-        Dir.glob(File.join(BUILTIN_PACKAGES, '*')).each do |path|
-          next unless File.exists? File.join(path, 'package.json')
+        for package_dir in package_dirs
+          Dir.glob(File.join(package_dir, '*')).each do |path|
+            json_file = File.join(path, 'package.json')
+            next unless File.exists?(json_file)
 
-          next if installed.include? path
-          installed << path
+            # How would this happen?
+            next if installed.include? path
+            installed << path
 
-          new_path = File.join(spade_path, 'packages', File.basename(path))
-          FileUtils.ln_s path, new_path, :force => true
-          puts "Installing built-in package #{File.basename(path)}" if verbose
-        end
+            json = JSON.load File.read(json_file)
+            package_name = json['name']
+            package_version = json['version']
 
-        # Do this to get the Gem.dir right
-        env = Spade::Environment.new
-        Dir.glob(File.join(env.spade_dir, 'gems', '*')).each do |path|
-          package_def = File.join(path, 'package.json')
-          next unless File.exists?(package_def)
-
-          next if installed.include? path
-          installed << path
-
-          json = JSON.load File.read(package_def)
-          package_name = json['name']
-          new_path = File.join(spade_path, 'packages', package_name)
-          FileUtils.ln_s path, new_path, :force => true
-          puts "Installing system package #{File.basename(path)}" if verbose
-        end
+            local = path.index(rootdir) == 0
 
+            # Use relative paths if embedded
+            old_path = if local
+              # Figure out how many levels deep the spade_path is in the project
+              levels = spade_path.sub(rootdir, '').split(File::SEPARATOR).reject{|p| p.empty? }.count
+              # Build relative path
+              File.join(['..'] * levels, path.sub(rootdir, ''))
+            else
+              path
+            end
 
-        Dir.glob(File.join(rootdir, 'packages', '*')).each do |path|
-          next unless File.exists? File.join(path, 'package.json')
+            new_path = File.join(spade_path, 'packages', package_name)
 
-          next if installed.include? path
-          installed << path
+            FileUtils.ln_s old_path, new_path, :force => true
 
-          package_name = File.basename(path)
-          old_path = File.join('..','..','packages', package_name)
-          new_path = File.join(spade_path, 'packages', File.basename(path))
-          FileUtils.ln_s old_path, new_path, :force => true
-          puts "Installing local package #{File.basename(path)}" if verbose
+            puts "Installing #{local ? "local" : "remote"} package #{package_name}" if verbose
+          end
         end
 
         File.open(File.join(rootdir, 'spade-boot.js'), 'w+') do |fp|

data/lib/spade/cli.rb

@@ -8,6 +8,7 @@ module Spade
   module CLI
     require 'spade/cli/owner'
     require 'spade/cli/base'
+    require 'spade/cli/project_generator'
 
     LOGIN_MESSAGE = "Please login first with `spade login`."
   end

data/lib/spade/cli/base.rb

@@ -1,5 +1,8 @@
 module Spade::CLI
   class Base < Thor
+    include Thor::Actions
+
+    source_root File.expand_path('../../templates', __FILE__)
 
     desc "owner", "Manage users for a package"
     subcommand "owner", Owner
@@ -228,6 +231,12 @@ module Spade::CLI
       print_specs(packages, index)
     end
 
+    desc "new [NAME]", "Generate a new project skeleton"
+    def new(name)
+      ProjectGenerator.new(self,
+        name, File.expand_path(name)).run
+    end
+
     desc "build", "Build a spade package from a package.json"
     def build
       local = Spade::Local.new

data/lib/spade/cli/project_generator.rb

@@ -0,0 +1,58 @@
+module Spade::CLI
+  class ProjectGenerator
+    include Thor::Actions
+
+    source_root File.expand_path('../../templates/project', __FILE__)
+
+    attr_reader :name
+
+    def initialize(thor, name, root)
+      @thor, @name, @root = thor, name, root
+
+      self.destination_root = root
+    end
+
+    def run
+      empty_directory '.'
+      FileUtils.cd(destination_root)
+
+      template "LICENSE"
+      template "README.md"
+      template "project.json"
+
+      empty_directory "lib"
+      empty_directory "tests"
+
+      inside "lib" do
+        template "main.js"
+      end
+
+      inside "tests" do
+        template "main-test.js"
+      end
+    end
+
+  private
+
+    def app_const
+      name.gsub(/\W|-/, '_').squeeze('_').gsub(/(?:^|_)(.)/) { $1.upcase }
+    end
+
+    def current_year
+      Time.now.year
+    end
+
+    def source_paths
+      [File.expand_path('../../templates/project', __FILE__)] +
+        @thor.source_paths
+    end
+
+    def respond_to?(*args)
+      super || @thor.respond_to?(*args)
+    end
+
+    def method_missing(name, *args, &blk)
+      @thor.send(name, *args, &blk)
+    end
+  end
+end

data/lib/spade/context.rb

@@ -10,7 +10,7 @@ require 'spade/compiler'
 require 'spade/console'
 require 'spade/reactor'
 
-TIKIJS_PATH = File.expand_path File.join(File.dirname(__FILE__), '..', 'spade.js')
+SPADEJS_PATH = File.expand_path File.join(File.dirname(__FILE__), '..', 'spade.js')
 
 module Spade
   
@@ -86,7 +86,7 @@ module Spade
         ctx['ARGV'] = opts[:argv] || ARGV
         
         # Load spade and patch in compiler and loader plugins
-        ctx.load(TIKIJS_PATH)
+        ctx.load(SPADEJS_PATH)
         ctx['rubyLoader'] = Loader.new(self)
         ctx['rubyCompiler'] = Compiler.new(self)
         

data/lib/spade/loader.rb

@@ -178,11 +178,6 @@ module Spade
       @packages unless @packages.nil?
       @packages = {}
 
-      # add global packages in spade project
-      # globals = File.expand_path(File.join(__FILE__, '..', '..', '..', 'packages'))
-      # package_paths = Dir.glob File.join(globals,'*')
-      # package_paths.each { |path| add_package(path) }      
-
       # Do this to get the Gem.dir right
       env = Spade::Environment.new
 

data/lib/spade/local.rb

@@ -1,17 +1,10 @@
 module Spade
   class Local < Repository
     def uninstall(package)
-      index = Gem::SourceIndex.from_gems_in(env.spade_dir("specifications"))
-      index.refresh!
-      specs = index.find_name package
-
-      if specs.first
-        uninstaller = Gem::Uninstaller.new(package, :ignore => true)
-        uninstaller.uninstall_gem(specs.first, specs)
-        true
-      else
-        false
-      end
+      Gem::Uninstaller.new(package).uninstall
+      true
+    rescue Gem::InstallError
+      false
     end
 
     def pack(path)

data/lib/spade/server.rb

@@ -57,6 +57,7 @@ module Spade
             [500, {}, error]
           end
         else
+          env['PATH_INFO'] == '/index.html' if env['PATH_INFO'] == '/'
           @app.call(env)
         end
       end

data/lib/spade/templates/project/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) <%= current_year %> YOUR NAME
+
+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
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 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.

data/lib/spade/templates/project/README.md

@@ -0,0 +1,21 @@
+# <%= name %>
+
+### Description:
+
+FIX (describe your package)
+
+### Features / Problems:
+
+  * FIX (list of features or problems)
+
+### Synopsis:
+
+FIX (code sample of usage)
+
+### Requirements:
+
+  * FIX (list of requirements)
+
+### Install:
+
+  * FIX (describe how to install)

data/lib/spade/templates/project/lib/main.js

@@ -0,0 +1,9 @@
+<%= app_const %> = {
+
+  // TODO: Write amazing code...
+  replaceMe: function() {
+    return "OMG you're so awesome!!!";
+  }
+}
+
+return <%= app_const %>;

data/lib/spade/templates/project/project.json

@@ -0,0 +1,31 @@
+{
+  "name":         "<%= name %>",
+  "description":  "DESCRIPTION HERE",
+  "summary":      "SUMMARY HERE",
+  "keywords":     ["javascript"],
+  "author":       "YOUR NAME HERE",
+  "homepage":     "URL",
+  "version":      "0.0.1",
+  "licenses":     [{
+    "type": "MIT",
+    "url":  "http://www.opensource.org/licenses/mit-license.php"
+  }],
+
+  "engines": ["browser", "all"],
+
+  "directories": {
+    "lib":        "./lib",
+    "test":       "./tests"
+  },
+
+  "main": "./lib/main",
+
+  "bin": {
+    "cot": "./bin/cot"
+  },
+
+  "dependencies": {
+    "ivory":    "= 0.0.1",
+    "optparse": "= 1.0.1"
+  }
+}

data/lib/spade/templates/project/tests/main-test.js

@@ -0,0 +1,8 @@
+Ct.module('<%= app_const %> tests');
+
+// TODO: Write real tests
+Ct.test('truth', function(t){
+  t.ok(true, 'should be true');
+});
+
+Ct.run();

data/lib/spade/version.rb

@@ -1,3 +1,3 @@
 module Spade
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spade",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "CommonJS Microkernel for Browser and Command Line",
 
   "maintainers": [

data/spec/cli/new_spec.rb

@@ -0,0 +1,5 @@
+require "spec_helper"
+
+describe "spade new" do
+  it "should be speced"
+end

data/spec/javascript/require-test.js

@@ -9,37 +9,37 @@ var Ct = require('core-test/sync'),
 
 // ..........................................................
 // BASIC REQUIRE
-// 
+//
 
 Ct.module('spade: basic require');
 
 Ct.setup(function(t) {
-  t.spade = new Spade(); 
+  t.spade = new Spade();
 });
 
-Ct.teardown(function(t) { 
+Ct.teardown(function(t) {
   delete t.spade;
 });
 
 
 Ct.test('register then require a module', function(t) {
   var spade = t.spade;
-  
-  spade.register('foo/bar', function(require, exports) { 
+
+  spade.register('foo/bar', function(require, exports) {
     exports.foo = 'bar';
   });
-  
+
   var exp = spade.require('foo/bar');
-  t.equal(exp.foo, 'bar', 'exports.foo == bar - means require succeeded');  
+  t.equal(exp.foo, 'bar', 'exports.foo == bar - means require succeeded');
 });
 
 Ct.test('register a string factory then require', function(t) {
   var spade = t.spade;
-  
+
   spade.register('foo/bar', "exports.foo = 'bar';");
-  
+
   var exp = spade.require('foo/bar');
-  t.equal(exp.foo, 'bar', 'exports.foo == bar - means require succeeded');  
+  t.equal(exp.foo, 'bar', 'exports.foo == bar - means require succeeded');
 });
 
 Ct.test('require a non-existant module will throw an exception', function(t) {
@@ -56,3 +56,62 @@ Ct.test('require a module that was just registered symbolically.  This is for co
 });
 
 Ct.test('require system installed packages');
+
+
+// ..........................................................
+// BASIC REQUIRE
+//
+
+Ct.module('spade: extension require');
+
+Ct.setup(function(t) {
+  t.spade = new Spade();
+
+  t.spade.register('foo', {
+    'plugin:formats': {
+      'css': 'foo/format',
+      'txt': 'foo/format'
+    }
+  });
+  t.spade.register('foo/format', "exports.compileFormat = function(code){ return code; };");
+  t.spade.register('foo/bar', "exports.foo = 'bar.js';",  { format: 'js' });
+  t.spade.register('foo/bar', "exports.foo = 'bar.css';", { format: 'css' });
+});
+
+Ct.teardown(function(t) {
+  delete t.spade;
+});
+
+
+Ct.test('valid extension', function(t) {
+  var exp = t.spade.require('foo/bar.js');
+  t.equal(exp.foo, 'bar.js', 'exports.foo == bar.js - means require succeeded');
+});
+
+Ct.test('same name different extensions', function(t){
+  var spade  = t.spade,
+      jsExp  = spade.require('foo/bar.js'),
+      cssExp = spade.require('foo/bar.css');
+
+  t.equal(jsExp.foo,  'bar.js',  'exports.foo == bar.js - means require succeeded');
+  t.equal(cssExp.foo, 'bar.css', 'exports.foo == bar.css - means require succeeded');
+});
+
+Ct.test("don't load file for different extension", function(t){
+  t.throws(function(){ t.spade.require('foo/bar.txt'); }, Error, 'adfaff');
+});
+
+Ct.test("defaults to js", function(t){
+  var exp = t.spade.require('foo/bar');
+  t.equal(exp.foo, 'bar.js', 'exports.foo == bar.js - means required js as default');
+});
+
+Ct.test("defaults to first registered if no js", function(t){
+  var spade = t.spade;
+
+  spade.register('foo/baz', "exports.foo = 'baz.css';", { format: 'css' });
+  spade.register('foo/baz', "exports.foo = 'baz.txt';", { format: 'txt' });
+
+  var exp = spade.require('foo/baz');
+  t.equal(exp.foo, 'baz.css', 'exports.foo == baz.css - means required last registered');
+});