spade 0.0.1 → 0.0.2

data/.gitmodules

@@ -1,15 +1,6 @@
 [submodule "packages/optparse"]
 	path = packages/optparse
 	url = https://github.com/qrush/optparse-js.git
-[submodule "packages/core-test"]
-	path = packages/core-test
-	url = https://github.com/strobecorp/core_test.git
-[submodule "packages/handlebars"]
-	path = packages/handlebars
-	url = https://github.com/wycats/handlebars.js.git
 [submodule "packages/coffee-script"]
 	path = packages/coffee-script
 	url = https://github.com/charlesjolley/coffee-script.git
-[submodule "sproutcore"]
-	path = sproutcore
-	url = git://github.com/sproutcore/sproutcore.git

data/Gemfile

@@ -1,19 +1,3 @@
 source :rubygems
 
-gem "eventmachine", "0.12.10"
-gem "highline",     "1.6.1"
-gem "json_pure",    "1.4.6"
-gem "rack",         "1.2.1"
-gem "thor",         "0.14.3"
-
-platforms :mri_18, :mri_19 do
-  gem "therubyracer", "0.8.0"
-end
-
-group :development do
-  gem "rspec"
-
-  platforms :mri_18 do
-    gem "system_timer"
-  end
-end
+gemspec

data/Gemfile.lock

@@ -1,12 +1,24 @@
+PATH
+  remote: .
+  specs:
+    spade (0.0.1)
+      eventmachine (~> 0.12.10)
+      gemcutter (~> 0.6.1)
+      highline (~> 1.6.1)
+      json_pure (~> 1.4.6)
+      rack (~> 1.2.1)
+      therubyracer (~> 0.8.0)
+      thor (~> 0.14.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
-    eventmachine (0.12.10-java)
+    gemcutter (0.6.1)
     highline (1.6.1)
     json_pure (1.4.6)
-    rack (1.2.1)
+    rack (1.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -15,20 +27,13 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    system_timer (1.0)
     therubyracer (0.8.0)
-    thor (0.14.3)
+    thor (0.14.6)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  eventmachine (= 0.12.10)
-  highline (= 1.6.1)
-  json_pure (= 1.4.6)
-  rack (= 1.2.1)
   rspec
-  system_timer
-  therubyracer (= 0.8.0)
-  thor (= 0.14.3)
+  spade!

data/lib/spade.rb

@@ -10,6 +10,7 @@ require 'rubygems/uninstaller'
 require 'rubygems/dependency_installer'
 require 'rubygems/gemcutter_utilities'
 require 'rubygems/validator'
+require 'rubygems_plugin' # Gemcutter
 
 require 'fileutils'
 require 'net/http'

data/lib/spade/cli/base.rb

@@ -13,6 +13,10 @@ module Spade::CLI
       :aliases => ['-V'],
       :desc => 'Show additional debug information while running'
 
+    class_option :version, :type => :string,
+      :aliases => ['-v'],
+      :desc => 'Package version'
+
     class_option :require, :type => :array, :required => false,
       :aliases => ['-r'],
       :desc => "optional JS files to require before invoking main command"
@@ -199,6 +203,20 @@ module Spade::CLI
       end
     end
 
+    desc "yank", "Remove a specific package version release from SproutCutter"
+    def yank(package)
+      if options[:version]
+        remote = Spade::Remote.new
+        if remote.logged_in?
+          say remote.yank(package, options[:version])
+        else
+          say LOGIN_MESSAGE
+        end
+      else
+        say "Version required"
+      end
+    end
+
     desc "list", "View available packages for download"
     method_option :all,        :type => :boolean, :default => false, :aliases => ['-a'],    :desc => 'List all versions available'
     method_option :prerelease, :type => :boolean, :default => false, :aliases => ['--pre'], :desc => 'List prerelease versions available'

data/lib/spade/package.rb

@@ -3,7 +3,7 @@ module Spade
     EXT      = "spd"
     METADATA = %w[keywords licenses engines main bin directories]
     FIELDS   = %w[name version description author homepage summary]
-    attr_accessor :metadata, :lib_path, :test_path, :errors, :json_path, :attributes, :directories
+    attr_accessor :metadata, :lib_path, :test_path, :errors, :json_path, :attributes, :directories, :dependencies
     attr_accessor *FIELDS
 
     def initialize(email = "")
@@ -26,20 +26,21 @@ module Spade
         spec.summary           = summary
         spec.description       = description
         spec.requirements      = [metadata.to_json]
-        spec.files             = glob_javascript(lib_path) + bin_files + ["package.json"]
-        spec.test_files        = glob_javascript(test_path) if test_path
+        spec.files             = directory_files + bin_files + ["package.json"]
+        spec.test_files        = glob_files(test_path) if test_path
         spec.rubyforge_project = "spade"
         def spec.file_name
           "#{full_name}.#{EXT}"
         end
+        dependencies.each{|d,v| spec.add_dependency(d, v) } if dependencies
       end
     end
 
     def as_json(options = {})
-      FIELDS.inject(self.metadata) do |json, key|
-        json[key] = send(key)
-        json
-      end
+      json = self.metadata.clone
+      FIELDS.each{|key| json[key] = send(key)}
+      json["dependencies"] = self.dependencies
+      json
     end
 
     def to_full_name
@@ -64,6 +65,10 @@ module Spade
 
     private
 
+    def directory_files
+      directories.values.map{|dir| glob_files(dir) }.flatten
+    end
+
     def bin_files
       if @attributes["bin"]
         @attributes["bin"].values
@@ -85,7 +90,8 @@ module Spade
         send("#{field}=", @attributes[field])
       end
 
-      self.directories = @attributes["directories"]
+      self.dependencies = @attributes["dependencies"] || {}
+      self.directories = @attributes["directories"] || {}
       self.metadata    = Hash[*@attributes.select { |k, v| METADATA.include?(k) }.flatten(1)]
     end
 
@@ -129,14 +135,16 @@ module Spade
       false
     end
 
-    def glob_javascript(path)
-      Dir[File.join(path, "**", "*.js")]
+    def glob_files(path)
+      Dir[File.join(path, "**", "*")].reject{|f| File.directory?(f) }
     end
 
     def fill_from_gemspec(spec)
-      FIELDS.each do |field|
-        send("#{field}=", spec.send(field).to_s)
-      end
+      FIELDS.each{|field| send("#{field}=", spec.send(field).to_s) }
+
+      self.dependencies = {}
+      spec.dependencies.each{|d| self.dependencies[d.name] = d.requirement.to_s }
+
       self.metadata = JSON.parse(spec.requirements.first)
     end
   end

data/lib/spade/remote.rb

@@ -32,6 +32,13 @@ module Spade
       end
     end
 
+    def yank(package, version)
+      request :delete, "api/v1/gems/yank" do |req|
+        req.set_form_data 'gem_name' => package, 'version' => version
+        req.add_field "Authorization", creds.api_key
+      end
+    end
+
     def add_owner(package, email)
       request :post, "api/v1/gems/#{package}/owners" do |req|
         req.set_form_data 'email' => email

data/lib/spade/version.rb

@@ -1,3 +1,3 @@
 module Spade
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spade.gemspec

@@ -15,12 +15,25 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
+  mswin = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+  mri = !mswin && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
+
+  s.add_dependency "gemcutter",    "~> 0.6.1"
+  s.add_dependency "eventmachine", "~> 0.12.10"
+  s.add_dependency "highline",     "~> 1.6.1"
+  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 "therubyracer", "~> 0.8.0" if mri
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "system_timer" if mri && RUBY_VERSION < "1.9"
+
   paths = `git submodule`.split("\n").map do |line|
     path = line.gsub(/^ \w+ ([^\s]+) .+$/,'\1')
     `cd #{path}; git ls-files`.split("\n").map { |p| File.join(path, p) }
   end
   paths << `git ls-files`.split("\n")
-  puts paths.flatten
   s.files      = paths.flatten
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 

data/spec/cli/build_spec.rb

@@ -10,18 +10,18 @@ describe "spade build when logged in" do
   end
 
   it "builds a spade from a given package.json" do
-    FileUtils.cp_r fixtures("coffee"), "."
-    FileUtils.cp fixtures("package.json"), "coffee"
-    cd "coffee"
+    FileUtils.cp_r fixtures("core-test"), "."
+    FileUtils.cp fixtures("package.json"), "core-test"
+    cd "core-test"
     spade "build"
 
     exit_status.should be_success
     output = stdout.read
-    output.should include("Successfully built package: coffee-1.0.1.pre.spd")
+    output.should include("Successfully built package: core-test-0.4.3.spd")
 
-    package = Gem::Format.from_file_by_path("coffee-1.0.1.pre.spd")
-    package.spec.name.should == "coffee"
-    package.spec.version.should == Gem::Version.new("1.0.1.pre")
+    package = Gem::Format.from_file_by_path("core-test-0.4.3.spd")
+    package.spec.name.should == "core-test"
+    package.spec.version.should == Gem::Version.new("0.4.3")
     package.spec.email.should == email
   end
 end

data/spec/cli/install_spec.rb

@@ -103,4 +103,18 @@ describe "spade install" do
     wait
     home(".gem").exist?.should be_false
   end
+
+  it "installs gem dependencies" do
+    spade "install", "core-test"
+
+    output = stdout.read
+
+    %w(ivory-0.0.1 optparse-1.0.1 core-test-0.4.3).each do |name|
+      output.should include("Successfully installed #{name}")
+
+      name.should be_fetched
+      name.should be_unpacked
+    end
+  end
+
 end

data/spec/cli/yank_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+
+describe "spade yank" do
+  let(:api_key) { "deadbeef" }
+  let(:creds)   { spade_dir("credentials") }
+
+  before do
+    cd(home)
+    env["HOME"] = home.to_s
+    env["RUBYGEMS_HOST"] = "http://localhost:9292"
+    start_fake(FakeGemcutter.new(api_key))
+  end
+
+  context "with a good api key" do
+    before do
+      write_api_key(api_key)
+    end
+
+    it "yanks a gem when sent with the right api key" do
+      spade "yank", "core-test", "-v", "1.4.3"
+
+      stdout.read.should include("Successfully yanked gem: core-test (1.4.3)")
+    end
+
+    it "must yank a valid gem" do
+      spade "yank", "blahblah", "-v", "0.0.1"
+
+      stdout.read.should include("This gem could not be found")
+    end
+  end
+
+  it "shows rejection message if wrong api key is supplied" do
+    write_api_key("beefbeef")
+
+    spade "yank", "core-test", "-v", "1.4.3"
+
+    stdout.read.should include("One cannot simply walk into Mordor!")
+  end
+end
+
+describe "spade yank without api key" do
+  before do
+    cd(home)
+    env["HOME"] = home.to_s
+    env["RUBYGEMS_HOST"] = "http://localhost:9292"
+    write_api_key("beefbeef")
+  end
+
+  it "must require a version" do
+    spade "yank", "core-test"
+
+    stdout.read.should include("Version required")
+  end
+end
+
+describe "spade yank without api key" do
+  before do
+    cd(home)
+    env["HOME"] = home.to_s
+    env["RUBYGEMS_HOST"] = "http://localhost:9292"
+  end
+
+  it "asks for login first if api key does not exist" do
+    spade "yank", "core-test", "-v", "1.4.3"
+
+    stdout.read.should include("Please login first with `spade login`")
+  end
+end

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

@@ -0,0 +1 @@
+# Placeholder for test, do not remove

data/spec/fixtures/core-test/lib/main.js

@@ -0,0 +1 @@
+// Placeholder for test, do not remove

data/spec/fixtures/core-test/tests/test.js

@@ -0,0 +1 @@
+// Placeholder for test, do not remove

data/spec/fixtures/package.json

@@ -1,25 +1,30 @@
 {
-    "name":         "coffee",
-    "description":  "CoffeeScript is a little language that compiles into JavaScript",
-    "summary":      "Unfancy JavaScript",
-    "keywords":     ["javascript", "language", "coffeescript", "compiler"],
-    "author":       "Jeremy Ashkenas",
-    "homepage":     "http://github.com/jashkenas/coffee-script",
-    "version":      "1.0.1.pre",
-    "licenses":     [{
-      "type":       "MIT",
-      "url":        "http://github.com/jashkenas/coffee-script/raw/master/LICENSE"
-    }],
-    "engines":      {
-      "node":       ">=0.2.5"
-    },
-    "directories" : {
-      "lib"  : "./lib",
-      "test" : "./qunit"
-    },
-    "main" : "./lib/coffee-script",
-    "bin":          {
-      "coffee":     "./bin/coffee",
-      "cake":       "./bin/cake"
-    }
+  "name": "core-test",
+  "description": "Flexible testing library for JavaScript.",
+  "summary": "A fully featured asynchronous testing library for JavaScript, compatible with other frameworks.",
+  "keywords": ["javascript", "testing"],
+  "author": "Charles Jolley",
+  "homepage": "https://github.com/strobecorp/core-test",
+  "version": "0.4.3",
+  "licenses":     [{
+    "type":       "MIT",
+    "url":        "https://github.com/strobecorp/core-test/raw/master/LICENSE"
+  }],
+  "engines": ["browser", "all"],
+  "directories": {
+    "lib": "./lib",
+    "resources": "./resources",
+    "test": "./tests"
+  },
+  "main": "./lib/main",
+  "bin": {
+    "cot": "./bin/cot"
+  },
+  "dependencies": {
+    "ivory": "= 0.0.1",
+    "optparse": "= 1.0.1"
+  }
 }
+
+
+

data/spec/gauntlet_spec.rb

@@ -11,9 +11,6 @@ describe "spade build the gauntlet" do
     "ivory"                => "0.0.1",
     "jquery"               => "1.4.3",
     "optparse"             => "1.0.1",
-    "sproutcore-runtime"   => "1.5",
-    "sproutcore-datetime"  => "1.5",
-    "sproutcore-datastore" => "1.5",
     "web-file"             => "0.0.1",
     "web-typed-array"      => "0.0.1",
   }.each do |package, version|