spade 0.1.0 → 0.1.1.1

data/lib/spade/version.rb

@@ -1,3 +1,3 @@
 module Spade
-  VERSION = '0.1.0'
+  VERSION = '0.1.1.1'
 end

data/spade.gemspec

@@ -13,14 +13,25 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/strobecorp/spade"
   s.summary = s.description = "Unified JavaScript runner for browser and command line"
 
-  s.add_dependency 'spade-packager', "~> 0.1.0"
-  s.add_dependency 'spade-runtime',  "~> 0.1.0"
+  s.add_dependency "eventmachine", "~> 0.12.10"
+  s.add_dependency "json_pure",    "~> 1.4.6"
+  s.add_dependency "rack",         "~> 1.2.1"
+  s.add_dependency "thor",         "~> 0.14.3"
+  s.add_dependency "childlabor",   "~> 0.0.3"
+  s.add_dependency "therubyracer", "~> 0.9.2"
 
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "bpm"
 
-  s.files = `git ls-files`.split("\n")
+  paths = `git submodule`.split("\n").map do |line|
+    path = line.gsub(/^.\w+\s+(\S+).*/,'\1')
+    `cd #{path}; git ls-files`.split("\n").map { |p| File.join(path, p) }
+  end
+  paths << `git ls-files`.split("\n")
+  s.files = paths.flatten
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.executables        = ['spade']
   s.require_paths      = ["lib"]
 end
+

data/spec/cli/update_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe "spade update" do
+  before do
+    # prep the application
+    goto_home
+
+    FileUtils.mkdir_p (@app_path = tmp.join("update_test"))
+    FileUtils.mkdir_p (@app_packages_path = @app_path.join("packages"))
+    FileUtils.mkdir_p (@app_vendor_packages_path = @app_path.join("vendor/packages"))
+    app_package_file_path = @app_path.join("package.json")
+    File.open(app_package_file_path, 'w') do |f2|
+      f2.puts '{"name":"update_test","dependencies":{"fake_package": null}}'
+    end
+    cd(@app_path)
+
+  end
+  after do
+    cd(home)
+    FileUtils.rm_r @app_path
+  end
+
+  it "should use required packages if they are in the application's packages folder" do
+    FileUtils.mkdir_p (package_path = @app_packages_path.join("fake_package"))
+    package_file_path = package_path.join("package.json")
+    File.open(package_file_path, 'w') do |f|
+      f.puts '{"name": "fake_package"}'
+    end
+    spade("update", "--working=#{@app_path.to_s}")
+    wait()
+    "fake_package".should be_linked_to("../../packages/fake_package")
+  end
+
+  it "should use required packages if they are in the application's vendor/packages folder" do
+    FileUtils.mkdir_p (package_path = @app_vendor_packages_path.join("fake_package"))
+    package_file_path = package_path.join("package.json")
+    File.open(package_file_path, 'w') do |f|
+      f.puts '{"name": "fake_package"}'
+    end
+    spade("update", "--working=#{@app_path.to_s}")
+    wait()
+    "fake_package".should be_linked_to("../../vendor/packages/fake_package")
+  end
+
+  it "should use required packages if they are in the home bpm directory" do
+    FileUtils.mkdir_p (package_path = bpm_dir.join("gems","fake_package"))
+    package_file_path = package_path.join("package.json")
+    File.open(package_file_path, 'w') do |f|
+      f.puts '{"name": "fake_package"}'
+    end
+    unthreaded_spade("update", "--working=#{@app_path.to_s}")
+    "fake_package".should be_linked_to(package_path)
+  end
+
+  it "should not try to choose from the home spade directory if BPM is not installed"
+  it "should install from the network repository if it does not exist elsewhere"
+  it "should raise an error if the package is in none of the locations"
+  it "should not link to a package if it is the incorrect version"
+  it "should not try to install the package if BPM is not installed"
+  it "should install the correct version"
+  it "should raise an error if the package is only available in the wrong version"
+  it "should select packages in the correct order if there are multiple equal editions"
+  it "should create a spade-boot.js"
+  it "should record the versions in spade-boot.js"
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+Bundler.require :default, :development
+
+require 'support/cli'
+require 'support/path'
+require 'support/matchers'
+
+RSpec.configure do |config|
+  working_dir = Dir.pwd
+
+  config.include SpecHelpers
+
+  config.around do |blk|
+    reset!
+
+    blk.call
+
+    kill!
+    Dir.chdir working_dir if Dir.pwd != working_dir
+  end
+end
+
+

data/spec/support/cli.rb

@@ -0,0 +1,103 @@
+require 'spade'
+require 'thor'
+
+module SpecHelpers
+  attr_reader :stdin, :stdout, :stderr
+
+  def env
+    @env ||= {}
+  end
+
+  def unthreaded_spade(*argv)
+    opts = Hash === argv.last ? argv.pop : {}
+    Spade::CLI::Base.start(argv)
+  end
+
+  def spade(*argv)
+    opts = Hash === argv.last ? argv.pop : {}
+
+    kill!
+    create_pipes
+
+    @pid = Process.fork do
+      Dir.chdir opts[:chdir] if opts[:chdir]
+
+      @stdout.close
+      STDOUT.reopen @stdout_child
+
+      @stdin.close
+      STDIN.reopen @stdin_child
+
+      if opts[:track_stderr]
+        @stderr.close
+        STDERR.reopen @stderr_child
+      end
+
+      env.each do |key, val|
+        ENV[key] = val
+      end
+
+      Spade::CLI::Base.start(argv)
+    end
+
+    @stdout_child.close
+    @stdin_child.close
+    @stderr_child.close
+    @pid
+  end
+
+  def out_until_block(io = stdout)
+    # read 1 first so we wait until the process is done processing the last write
+    chars  = io.read(1)
+
+    loop do
+      chars << io.read_nonblock(1000)
+      sleep 0.05
+    end
+  rescue Errno::EAGAIN, EOFError
+    chars
+  end
+
+  def input(line, opts = {})
+    if on = opts[:on]
+      should_block_on on
+    end
+    stdin << "#{line}\n"
+  end
+
+  def wait
+    return unless @pid
+
+    pid, status = Process.wait2(@pid, 0)
+
+    @exit_status = status
+    @pid = nil
+  end
+
+  def exit_status
+    wait
+    @exit_status
+  end
+
+  def kill!
+    Process.kill(9, @pid) if @pid
+  end
+
+  def create_pipes
+    @stdout, @stdout_child = IO.pipe
+    @stdin_child, @stdin   = IO.pipe
+    @stderr, @stderr_child = IO.pipe
+  end
+
+  def write_api_key(api_key)
+    write_creds("user@example.com", api_key)
+  end
+
+  def write_creds(email, api_key)
+    FileUtils.mkdir_p(spade_dir)
+    File.open(spade_dir("credentials"), "w") do |file|
+      file.write YAML.dump(:spade_api_key => api_key, :spade_email => email)
+    end
+  end
+end
+

data/spec/support/matchers.rb

@@ -0,0 +1,12 @@
+RSpec::Matchers.define :be_linked_to do |package_path|
+  include SpecHelpers
+  match do |package_name|
+    package_link_path = tmp.join("update_test",".spade","packages",package_name) 
+    File.readlink(package_link_path).to_s == package_path.to_s
+  end
+  failure_message_for_should do |package_name|
+    package_link_path = tmp.join("update_test",".spade","packages",package_name)
+    "expected that #{package_name} would be linked to #{package_path}, but is linked to #{File.readlink(package_link_path)}"
+  end
+end
+

data/spec/support/path.rb

@@ -0,0 +1,66 @@
+module SpecHelpers
+  def reset!
+    FileUtils.rm_rf   tmp
+    [ home, local ].each do |dir|
+      FileUtils.mkdir_p(dir)
+    end
+  end
+
+  def cd(path, &blk)
+    Dir.chdir(path, &blk)
+  end
+
+  def cwd(*args)
+    Pathname.new(Dir.pwd).join(*args)
+  end
+
+  def rm(path)
+    FileUtils.rm path
+  end
+
+  def rm_r(path)
+    FileUtils.rm_r path
+  end
+
+  def rm_rf(path)
+    FileUtils.rm_rf(path)
+  end
+
+  def root
+    @root ||= Pathname.new(File.expand_path("../../..", __FILE__))
+  end
+
+  def fixtures(*path)
+    root.join('spec/fixtures', *path)
+  end
+
+  def tmp(*path)
+    root.join("tmp", *path)
+  end
+
+  def home(*path)
+    tmp.join("home", *path)
+  end
+
+  def local(*path)
+    tmp.join("local", *path)
+  end
+
+  def spade_dir(*path)
+    home(Spade::SPADE_DIR, *path)
+  end
+
+  def bpm_dir(*path)
+    home(BPM::BPM_DIR, *path)
+  end
+
+  def goto_home
+    cd(home)
+    ENV["HOME"] = home.to_s
+    LibGems.clear_paths
+  end
+
+  module_function :root, :tmp, :home, :local
+end
+
+

metadata

@@ -1,124 +1,192 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spade
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Charles Jolley
 - Peter Wagenet
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: spade-packager
+date: 2011-06-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &2153224260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153224260
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &2153223720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2153223720
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2153223140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: spade-runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153223140
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2153222380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+      - !ruby/object:Gem::Version
+        version: 0.14.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153222380
+- !ruby/object:Gem::Dependency
+  name: childlabor
+  requirement: &2153219100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153219100
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: &2153218000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153218000
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2153217460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153217460
+- !ruby/object:Gem::Dependency
+  name: bpm
+  requirement: &2153215880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2153215880
 description: Unified JavaScript runner for browser and command line
-email: 
+email:
 - charles@sproutcore.com
 - peterw@strobecorp.com
-executables: 
+executables:
 - spade
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/spade/package/.gitignore
+- lib/spade/package/Gemfile
+- lib/spade/package/lib/spade.js
+- lib/spade/package/lib/wrapper.js
+- lib/spade/package/package.json
+- lib/spade/package/spec/javascript/async-test.js
+- lib/spade/package/spec/javascript/compiler/javascript.js
+- lib/spade/package/spec/javascript/compiler/ruby.js
+- lib/spade/package/spec/javascript/loader-test.js
+- lib/spade/package/spec/javascript/normalize-test.js
+- lib/spade/package/spec/javascript/packages-test.js
+- lib/spade/package/spec/javascript/relative-require-test.js
+- lib/spade/package/spec/javascript/require-test.js
+- lib/spade/package/spec/javascript/sandbox/creation.js
+- lib/spade/package/spec/javascript/sandbox/evaluate.js
+- lib/spade/package/spec/javascript/sandbox/format.js
+- lib/spade/package/spec/javascript/sandbox/misc.js
+- lib/spade/package/spec/javascript/sandbox/preprocessor.js
+- lib/spade/package/spec/javascript/sandbox/require.js
+- lib/spade/package/spec/javascript/sandbox/run-command.js
+- lib/spade/package/spec/javascript/spade/externs.js
+- lib/spade/package/spec/javascript/spade/load-factory.js
+- lib/spade/package/spec/javascript/spade/misc.js
+- lib/spade/package/spec/javascript/spade/ready.js
+- lib/spade/package/spec/javascript/spade/register.js
+- lib/spade/package/spec/javascript_spec.rb
+- lib/spade/package/spec/spec_helper.rb
+- lib/spade/package/spec/support/core_test.rb
 - .gitignore
 - .gitmodules
-- .rspec
-- Buildfile
-- README.md
-- Rakefile
+- Gemfile
 - bin/spade
-- examples/format-app/lib/hello.coffee
-- examples/format-app/lib/main.js
-- examples/format-app/package.json
-- examples/format-app/resources/README.txt
-- examples/format-app/resources/config.json
-- examples/path-test/lib/hello.js
-- examples/path-test/lib/main.js
-- examples/path-test/package.json
-- examples/sc-app/index.html
-- examples/sc-app/lib/main.js
-- examples/sc-app/package.json
-- examples/single-file.js
-- examples/todos/index.html
-- examples/todos/lib/main.js
-- examples/todos/lib/todos.js
-- examples/todos/package.json
-- examples/todos/resources/stylesheets/todos.css
-- examples/todos/resources/templates/todos.handlebars
-- examples/web-app/README.md
-- examples/web-app/index.html
-- examples/web-app/lib/main.js
-- examples/web-app/package.json
-- examples/web-app/tests.html
-- examples/web-app/tests/ct-example-test.js
-- examples/web-app/tests/qunit-test.js
 - lib/spade.rb
+- lib/spade/bundle.rb
 - lib/spade/cli.rb
+- lib/spade/cli/base.rb
+- lib/spade/console.rb
+- lib/spade/context.rb
+- lib/spade/evaluator.rb
+- lib/spade/exports.rb
+- lib/spade/loader.rb
+- lib/spade/reactor.rb
+- lib/spade/server.rb
+- lib/spade/shell.rb
 - lib/spade/version.rb
 - spade.gemspec
+- spec/cli/update_spec.rb
+- spec/spec_helper.rb
+- spec/support/cli.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
 homepage: http://github.com/strobecorp/spade
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Unified JavaScript runner for browser and command line
-test_files: []
-
+test_files:
+- spec/cli/update_spec.rb
+- spec/spec_helper.rb
+- spec/support/cli.rb
+- spec/support/matchers.rb
+- spec/support/path.rb