spade 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spade (0.0.2)
+    spade (0.0.3)
       eventmachine (~> 0.12.10)
       gemcutter (~> 0.6.1)
       highline (~> 1.6.1)

data/lib/spade.js

@@ -67,7 +67,6 @@ var spade ;
   }
   
   function normalize(id, contextId, contextPkg, _asPackage) {
-    
     // slice separator off the end since it is not used...
     if (id[id.length-1]==='/') id = id.slice(0,-1);
 
@@ -77,18 +76,17 @@ var spade ;
           idx = 0,
           len = id.length,
           part, next,
+          packageName = parts[0],
           useTilde = false;
 
-      var module = parts.pop(); // get rid of the last path element since it is a module.
-
+      if (contextPkg && contextPkg.main && contextId === packageName+'/main') {
       // If we're requiring from main we need to handle relative requires specially
-      // I'm not sure if this is required by spec, but at least some CommonJS packages require it (jsdom)
-      if (module === 'main' && contextPkg && contextPkg.main) {
         useTilde = true;
         parts = contextPkg.main.replace(/^\.?\//, '').split('/');
-        parts.pop(); // Remove module
       }
 
+      parts.pop(); // get rid of the last path element since it is a module.
+
       while(idx<len) {
         next = id.indexOf('/', idx);
         if (next<0) next = len;
@@ -102,16 +100,7 @@ var spade ;
       id = parts.join('/');
 
       // Make the path into a root relative path
-      if (useTilde) {
-        var dirPath;
-        for (var name in contextPkg.directories) {
-          dirPath = contextPkg.directories[name].replace(/^\.?\//, '');
-          if (id.substring(0, dirPath.length) === dirPath) {
-            id = id.replace(dirPath, contextPkg.name+'/~'+name);
-            break;
-          }
-        }
-      }
+      if (useTilde) { id = packageName+'/~'+id; }
 
     // else, just slice off beginning '/' if needed
     } else if (id[0]==='/') id = id.slice(1);
@@ -124,7 +113,12 @@ var spade ;
     // slice separators off begin and end
     if (id[0]==='/') id = id.slice(1);
 
-    
+    // Convert root relative paths to normal paths where possible
+    if (contextPkg && contextPkg.directories) {
+      var libPath = contextPkg.directories['lib'];
+      if (libPath) { id = id.replace('~'+libPath.replace(/^\.?\//, '')+'/', ''); }
+    }
+
     return remap(id, contextPkg);
   }
 

data/lib/spade/bundle.rb

@@ -24,6 +24,9 @@ module Spade
 
         installed = []
 
+
+        #TODO: Clean up duplication here
+
         Dir.glob(File.join(BUILTIN_PACKAGES, '*')).each do |path|
           next unless File.exists? File.join(path, 'package.json')
 
@@ -35,6 +38,23 @@ module Spade
           puts "Installing built-in package #{File.basename(path)}" if verbose
         end
 
+        # 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
+
+
         Dir.glob(File.join(rootdir, 'packages', '*')).each do |path|
           next unless File.exists? File.join(path, 'package.json')
 

data/lib/spade/dependency_installer.rb

@@ -0,0 +1,103 @@
+require 'spade/installer'
+
+module Spade
+  class DependencyInstaller < Gem::DependencyInstaller
+
+    # Had to overwrite this all just to change the match from /gem$/ to /spd$/
+    def find_spec_by_name_and_version(gem_name,
+                                      version = Gem::Requirement.default,
+                                      prerelease = false)
+      spec_and_source = nil
+
+      glob = if File::ALT_SEPARATOR then
+               gem_name.gsub File::ALT_SEPARATOR, File::SEPARATOR
+             else
+               gem_name
+             end
+
+      local_gems = Dir["#{glob}*"].sort.reverse
+
+      unless local_gems.empty? then
+        local_gems.each do |gem_file|
+          next unless gem_file =~ /spd$/
+          begin
+            spec = Gem::Format.from_file_by_path(gem_file).spec
+            spec_and_source = [spec, gem_file]
+            break
+          rescue SystemCallError, Gem::Package::FormatError
+          end
+        end
+      end
+
+      if spec_and_source.nil? then
+        dep = Gem::Dependency.new gem_name, version
+        dep.prerelease = true if prerelease
+        spec_and_sources = find_gems_with_sources(dep).reverse
+
+        spec_and_source = spec_and_sources.find { |spec, source|
+          Gem::Platform.match spec.platform
+        }
+      end
+
+      if spec_and_source.nil? then
+        raise Gem::GemNotFoundException.new(
+          "Could not find a valid spd '#{gem_name}' (#{version}) locally or in a repository",
+          gem_name, version, @errors)
+      end
+
+      @specs_and_sources = [spec_and_source]
+    end
+
+    # Overwrite this to use our custom installer
+    def install dep_or_name, version = Gem::Requirement.default
+      if String === dep_or_name then
+        find_spec_by_name_and_version dep_or_name, version, @prerelease
+      else
+        dep_or_name.prerelease = @prerelease
+        @specs_and_sources = [find_gems_with_sources(dep_or_name).last]
+      end
+
+      @installed_gems = []
+
+      gather_dependencies
+
+      @gems_to_install.each do |spec|
+        last = spec == @gems_to_install.last
+        # HACK is this test for full_name acceptable?
+        next if @source_index.any? { |n,_| n == spec.full_name } and not last
+
+        # TODO: make this sorta_verbose so other users can benefit from it
+        say "Installing spd #{spec.full_name}" if Gem.configuration.really_verbose
+
+        _, source_uri = @specs_and_sources.assoc spec
+        begin
+          local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
+                                                               @cache_dir
+        rescue Gem::RemoteFetcher::FetchError
+          next if @force
+          raise
+        end
+
+        inst = Spade::Installer.new local_gem_path,
+                                  :bin_dir             => @bin_dir,
+                                  :development         => @development,
+                                  :env_shebang         => @env_shebang,
+                                  :force               => @force,
+                                  :format_executable   => @format_executable,
+                                  :ignore_dependencies => @ignore_dependencies,
+                                  :install_dir         => @install_dir,
+                                  :security_policy     => @security_policy,
+                                  :source_index        => @source_index,
+                                  :user_install        => @user_install,
+                                  :wrappers            => @wrappers
+
+        spec = inst.install
+
+        @installed_gems << spec
+      end
+
+      @installed_gems
+    end
+
+  end
+end

data/lib/spade/installer.rb

@@ -0,0 +1,40 @@
+module Spade
+  class Installer < Gem::Installer
+
+    def app_script_text(bin_file_name)
+      <<-TEXT
+#{shebang bin_file_name}
+#
+# This file was generated by Spade.
+#
+# The application '#{@spec.name}' is installed as part of an spd, and
+# this file is here to facilitate running it.
+#
+
+require 'spade'
+
+# Configures RubyGems properly
+env = Spade::Environment.new
+
+version = "#{Gem::Requirement.default}"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+gem '#{@spec.name}', version
+
+path = Gem.bin_path('#{@spec.name}', '#{bin_file_name}', version)
+shebang = File.open(path){|f| f.readline }
+
+if shebang =~ /^\#\!.*ruby/
+  load path
+else
+  exec path, *ARGV
+end
+TEXT
+    end
+
+  end
+end

data/lib/spade/package.rb

@@ -26,8 +26,10 @@ module Spade
         spec.summary           = summary
         spec.description       = description
         spec.requirements      = [metadata.to_json]
-        spec.files             = directory_files + bin_files + ["package.json"]
+        spec.files             = directory_files + ["package.json"]
         spec.test_files        = glob_files(test_path) if test_path
+        spec.bindir            = bin_path
+        spec.executables       = bin_files.map{|p| File.basename(p) } if bin_path
         spec.rubyforge_project = "spade"
         def spec.file_name
           "#{full_name}.#{EXT}"
@@ -77,6 +79,10 @@ module Spade
       end
     end
 
+    def bin_path
+      @directories["bin"] || "bin"
+    end
+
     def lib_path
       @directories["lib"]
     end

data/lib/spade/remote.rb

@@ -1,3 +1,5 @@
+require 'spade/dependency_installer'
+
 module Spade
   class Remote < Repository
     extend Gem::GemcutterUtilities
@@ -72,7 +74,7 @@ module Spade
     end
 
     def install(package, version, prerelease)
-      inst = Gem::DependencyInstaller.new(:prerelease => prerelease)
+      inst = Spade::DependencyInstaller.new(:prerelease => prerelease)
       inst.install package, Gem::Requirement.new([version])
       inst.installed_gems
     end

data/lib/spade/version.rb

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

data/spec/cli/update_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe "spade update" do
+  it "should create a spade-boot.js"
+  it "should use pre-installed packages"
+  it "should use system installed packages"
+  it "should use local packages"
+end

data/spec/fixtures/core-test/bin/cot

@@ -1 +1,3 @@
+#!/bin/bash
+
 # Placeholder for test, do not remove

data/spec/javascript/normalize-test.js

@@ -46,7 +46,6 @@ Ct.test('normalize', function(t) {
 
 Ct.test('normalize package', function(t) {
   var spade = t.spade;
-  
   spade.register('sproutcore', {}); // register as a package
   t.equal(spade.normalize('sproutcore'), 'sproutcore/main');
   t.equal(spade.normalize('foo/sproutcore'), 'foo/sproutcore');
@@ -54,6 +53,21 @@ Ct.test('normalize package', function(t) {
 
 Ct.test('normalize relative require from main', function(t) {
   // I think this is a valid test, but not certain
-  t.spade.register('sproutcore', { main: './lib/sproutcore/main' });
-  t.equal(spade.normalize('./sproutcore/core', 'sproutcore/main'), 'sproutcore/sproutcore/core');
+  var spade = t.spade, mainRequire, otherRequire;
+  spade.register('foo', { main: './lib/foo', directories: { lib: './lib/foo' } });
+  spade.register('foo/main', 'return require;');
+  spade.register('foo/other/main', 'return require;');
+  mainRequire = spade.require('foo/main');
+  otherRequire = spade.require('foo/other/main');
+  t.equal(mainRequire.normalize('./foo/adfadf'), 'foo/adfadf', 'works for real main');
+  t.equal(otherRequire.normalize('./foo/core'), 'foo/other/foo/core', "no difference for fake main");
+});
+
+Ct.test('normalize tilde paths with lib', function(t){
+  var spade = t.spade, fooRequire;
+  spade.register('foo', { directories: { lib: './lib' }}); // register as a package
+  spade.register('foo/main', 'return require;');
+  fooRequire = spade.require('foo');
+  t.equal(fooRequire.normalize('foo/~lib/main'), 'foo/main');
+  t.equal(fooRequire.normalize('foo/~lib/core'), 'foo/core');
 });

data/spec/javascript/require-test.js

@@ -54,3 +54,5 @@ Ct.test('require a module that was just registered symbolically.  This is for co
   spade.register('not/a-module');
   t.ok(spade.require('not/a-module'));
 });
+
+Ct.test('require system installed packages');

metadata

@@ -2,7 +2,7 @@
 name: spade
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Charles Jolley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -07:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: spade
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -354,8 +354,10 @@ files:
 - lib/spade/console.rb
 - lib/spade/context.rb
 - lib/spade/credentials.rb
+- lib/spade/dependency_installer.rb
 - lib/spade/environment.rb
 - lib/spade/exports.rb
+- lib/spade/installer.rb
 - lib/spade/loader.rb
 - lib/spade/local.rb
 - lib/spade/package.rb
@@ -430,6 +432,7 @@ files:
 - spec/cli/uninstall_spec.rb
 - spec/cli/unpack_spec.rb
 - spec/cli/unyank_spec.rb
+- spec/cli/update_spec.rb
 - spec/cli/yank_spec.rb
 - spec/credentials_spec.rb
 - spec/fixtures/badrake-0.8.7.gem
@@ -516,6 +519,7 @@ test_files:
 - spec/cli/uninstall_spec.rb
 - spec/cli/unpack_spec.rb
 - spec/cli/unyank_spec.rb
+- spec/cli/update_spec.rb
 - spec/cli/yank_spec.rb
 - spec/credentials_spec.rb
 - spec/fixtures/badrake-0.8.7.gem