bpm 0.1.0 → 0.1.2

data/spec/cli/add_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 require 'json'
 
 describe 'bpm add' do
-  
+
   before do
     goto_home
     set_host
     start_fake(FakeGemServer.new)
     FileUtils.cp_r(fixtures('hello_world'), '.')
     cd home('hello_world')
-    
+
     bpm 'compile'
     wait
   end
@@ -19,93 +19,93 @@ describe 'bpm add' do
     bpm "add", "jquery", :track_stderr => true
     stderr.read.should include("inside of a bpm project")
   end
-  
+
   it "should add a new hard dependency" do
     bpm 'add', 'jquery'
     wait
-    
+
     output = stdout.read
     output.should include("Added package 'jquery' (1.4.3)")
     has_dependency 'jquery', '1.4.3'
   end
-  
+
   it "adds multiple package dependencies" do
     bpm "add", "jquery", "rake"
-  
+
     output = stdout.read
-  
+
     %w(jquery:1.4.3 rake:0.8.7).each do |pkg|
       pkg_name, pkg_version = pkg.split ':'
       output.should include("Added package '#{pkg_name}' (#{pkg_version})")
       has_dependency pkg_name, pkg_version
     end
   end
-  
+
   it "installs hard and soft dependencies" do
     bpm 'add', 'coffee', '--pre'
     wait
-    
+
     output = stdout.read
-    
+
     output.should include("Added package 'coffee' (1.0.1.pre)")
     output.should include("Added package 'jquery' (1.4.3)")
-    
+
     has_dependency 'coffee', '1.0.1.pre', '>= 0-pre'
     has_soft_dependency 'jquery', '1.4.3'
   end
-  
+
   it "adds no packages when any are invalid" do
     bpm "add", "jquery", "fake", :track_stderr => true
-  
-    stderr.read.should include("Could not find package 'fake'")
-  
+
+    stderr.read.should == "Could not find eligable package for 'fake' (>= 0)\n"
+
     no_dependency 'jquery'
     no_dependency 'fake'
   end
-  
+
   it "fails when adding invalid package" do
     bpm "add", "fake", :track_stderr => true
-  
-    stderr.read.should include("Could not find package 'fake'")
+
+    stderr.read.should == "Could not find eligable package for 'fake' (>= 0)\n"
     no_dependency 'fake'
   end
-  
+
   it "fails if bpm can't write to the json or packages directory" do
     FileUtils.mkdir_p home('hello_world', 'packages')
     FileUtils.chmod 0555, home('hello_world', 'packages')
     FileUtils.chmod 0555, home('hello_world', 'hello_world.json')
-  
+
     bpm "add", "jquery", :track_stderr => true
     exit_status.should_not be_success
     no_dependency 'jquery'
-    
+
     FileUtils.chmod 0755, home('hello_world', 'packages')
     FileUtils.chmod 0755, home('hello_world', 'hello_world.json')
   end
-  
+
   it "adds packages with different versions" do
     bpm "add", "rake", "-v", "0.8.6"
-  
+
     stdout.read.should include("Added package 'rake' (0.8.6)")
     has_dependency 'rake', '0.8.6', '0.8.6'
   end
-  
+
   it "updates a package to latest version" do
     bpm 'add', 'rake', '-v', '0.8.6'
     wait
     has_dependency 'rake', '0.8.6', '0.8.6' # precond
-  
+
     output = stdout.read
     bpm 'add', 'rake'
     wait
-  
+
     output = stdout.read
     output.should_not include('Fetched spade') # not required 2nd time
     output.should_not include("Added package 'spade' (0.5.0)")
     output.should include("Added package 'rake' (0.8.7)")
     has_dependency 'rake', '0.8.7'
   end
-  
+
   it "adds a valid prerelease package" do
     bpm "add", "bundler", "--pre", "--verbose"
     wait
@@ -113,24 +113,24 @@ describe 'bpm add' do
     output.should include("Added package 'bundler' (1.1.pre)")
     has_dependency 'bundler', '1.1.pre', '>= 0-pre'
   end
-  
+
   it "does not add the normal package when asking for a prerelease" do
     bpm "add", "rake", "--pre", :track_stderr => true
     wait
-    stderr.read.should include("Could not find prerelease package 'rake'")
+    stderr.read.should == "Could not find eligable package for 'rake' (>= 0-pre)\n"
     no_dependency 'rake'
   end
-  
+
   it "requires at least one package to add" do
     bpm "add", :track_stderr => true
     stderr.read.should include("at least one package")
   end
-  
+
   it "should make a soft dependency a hard dependency" do
     bpm 'compile'
     wait
     has_soft_dependency 'ivory', '0.0.1'  # precond
-    
+
     bpm 'add', 'ivory'
     wait
     has_dependency 'ivory', '0.0.1'
@@ -138,22 +138,25 @@ describe 'bpm add' do
 
   it "should use local package if available" do
     no_dependency 'custom_package'
-  
+
     bpm "add", "custom_package"
     output = stdout.read
-  
+
     output.should include("Using local package 'custom_package'")
     has_dependency 'custom_package', '2.0.0'
     has_soft_dependency 'rake', '0.8.6'
   end
-  
+
   it "should fail if local package version is not compatible" do
     bpm "add", "custom_package", "-v", "3.0.0", :track_stderr => true
     output = stderr.read
     output.should include("'custom_package' (2.0.0) is not compatible")
     no_dependency 'custom_package'
   end
-  
+
   it "should verify working with config-less projects"
-  
+
+  it "should work with .bpkg file"
+  # i.e. `bpm add package.bpkg`
+
 end

data/spec/cli/build_spec.rb

@@ -16,9 +16,9 @@ describe "bpm build when logged in" do
 
     exit_status.should be_success
     output = stdout.read
-    output.should include("Successfully built package: core-test-0.4.9.spd")
+    output.should include("Successfully built package: core-test-0.4.9.bpkg")
 
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.spd")
+    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
     package.spec.name.should == "core-test"
     package.spec.version.should == LibGems::Version.new("0.4.9")
     package.spec.email.should == email
@@ -37,7 +37,7 @@ describe "bpm build without logging in" do
 
     exit_status.should be_success
   
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.spd")
+    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
     package.spec.name.should == "core-test"
     package.spec.version.should == LibGems::Version.new("0.4.9")
   end
@@ -49,7 +49,7 @@ describe "bpm build without logging in" do
     exit_status.should be_success
     
     cd 'core-test'
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.spd")
+    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
     package.spec.name.should == "core-test"
     package.spec.version.should == LibGems::Version.new("0.4.9")
   end
@@ -62,7 +62,7 @@ describe "bpm build without logging in" do
     exit_status.should be_success
     output = stdout.read
 
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.spd")
+    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
     package.spec.name.should == "core-test"
     package.spec.version.should == LibGems::Version.new("0.4.9")
     package.spec.email.should == "lucy@allen.com"

data/spec/cli/new_spec.rb

@@ -48,41 +48,67 @@ describe "bpm new" do
 
   describe "package templates" do
 
-    before do
-      goto_home
+    describe "with custom generator" do
+
+      before do
+        goto_home
 
-      # Install package
-      cd fixtures
-      with_env do
-        BPM::Remote.new.install("custom_generator-1.0.spd", ">= 0", false)
+        # Install package
+        cd fixtures
+        with_env do
+          BPM::Remote.new.install("custom_generator-1.0.bpkg", ">= 0", false)
+        end
+        cd home
       end
-      cd home
-    end
 
-    it "should create custom files" do
-      bpm 'new', 'BpmTest', '--package=custom_generator'
+      it "should create custom files" do
+        bpm 'new', 'BpmTest', '--package=custom_generator'
 
-      files = %w(lib lib/main.js app.js BpmTest.json assets assets/bpm_packages.js assets/bpm_styles.css)
+        files = %w(lib lib/main.js app.js BpmTest.json assets assets/bpm_packages.js assets/bpm_styles.css)
 
-      # output without coloration
-      output = stdout.read.gsub(/\e\[\d+m/,'')
+        # output without coloration
+        output = stdout.read.gsub(/\e\[\d+m/,'')
 
-      files.each do |file|
-        output.should =~ /create\s+#{file}$/
-        home("bpm_test", file).should exist
+        files.each do |file|
+          output.should =~ /create\s+#{file}$/
+          home("bpm_test", file).should exist
+        end
       end
-    end
 
-    it "should create custom app.js with explicit generator" do
-      bpm 'new', 'BpmTest', '--package=custom_generator' and wait
+      it "should create custom app.js with explicit generator" do
+        bpm 'new', 'BpmTest', '--package=custom_generator' and wait
+
+        File.read(home("bpm_test", "app.js")).should == "require('BpmTest/main.js')\n"
+      end
+
+      it "should create custom project.json without explicit generator" do
+        bpm 'new', 'BpmTest', '--package=custom_generator' and wait
+
+        File.read(home("bpm_test", "BpmTest.json")).should =~ /"spade": ">= 0"/
+      end
 
-      File.read(home("bpm_test", "app.js")).should == "require('BpmTest/main.js')\n"
     end
 
-    it "should create custom project.json without explicit generator" do
-      bpm 'new', 'BpmTest', '--package=custom_generator' and wait
+    describe "with custom generator" do
+
+      before do
+        goto_home
+
+        # Install package
+        cd fixtures
+        with_env do
+          installed = BPM::Remote.new.install("jquery-1.4.3.bpkg", ">= 0", false)
+          puts installed.inspect
+        end
+        cd home
+      end
+
+      it "should add package as a dependency even if it doesn't have custom generator" do
+        bpm 'new', 'BpmTest', '--package=jquery' and wait
+
+        File.read(home("bpm_test", "BpmTest.json")).should =~ /"dependencies": {\n\s+"jquery": "1.4.3"\n\s+}/
+      end
 
-      File.read(home("bpm_test", "BpmTest.json")).should =~ /"spade": ">= 0"/
     end
 
     it "should install the package if it doesn't exist locally"

data/spec/cli/push_spec.rb

@@ -16,7 +16,7 @@ describe "bpm push" do
     end
 
     it "registers a gem when sent with the right api key" do
-      bpm "push", "../../spec/fixtures/rake-0.8.7.spd"
+      bpm "push", "../../spec/fixtures/rake-0.8.7.bpkg"
 
       stdout.read.should include("Successfully registered rake (0.8.7)")
     end
@@ -25,7 +25,7 @@ describe "bpm push" do
   it "shows rejection message if wrong api key is supplied" do
     write_api_key("beefbeef")
 
-    bpm "push", "../../spec/fixtures/rake-0.8.7.spd"
+    bpm "push", "../../spec/fixtures/rake-0.8.7.bpkg"
 
     stdout.read.should include("One cannot simply walk into Mordor!")
   end
@@ -40,13 +40,13 @@ describe "bpm push without api key" do
   end
 
   it "ignores files that don't exist" do
-    bpm "push", "rake-1.0.0.spd"
+    bpm "push", "rake-1.0.0.bpkg"
 
     stdout.read.should include("No such file")
   end
 
   it "must push a valid gem" do
-    bpm "push", "../../spec/fixtures/badrake-0.8.7.spd"
+    bpm "push", "../../spec/fixtures/badrake-0.8.7.bpkg"
 
     stdout.read.should include("There was a problem opening your package.")
   end
@@ -66,7 +66,7 @@ describe "bpm push without api key" do
   end
 
   it "asks for login first if api key does not exist" do
-    bpm "push", "../../spec/fixtures/rake-0.8.7.spd"
+    bpm "push", "../../spec/fixtures/rake-0.8.7.bpkg"
 
     stdout.read.should include("Please login first with `bpm login`")
   end

data/spec/cli/unpack_spec.rb

@@ -6,8 +6,8 @@ describe "bpm unpack" do
   end
 
   it "builds a gem from a given package.json" do
-    FileUtils.cp fixtures("coffee-1.0.1.pre.spd"), "."
-    bpm "unpack", "coffee-1.0.1.pre.spd"
+    FileUtils.cp fixtures("coffee-1.0.1.pre.bpkg"), "."
+    bpm "unpack", "coffee-1.0.1.pre.bpkg"
 
     exit_status.should be_success
     output = stdout.read
@@ -22,8 +22,8 @@ describe "bpm unpack" do
   end
 
   it "can unpack to a different directory" do
-    FileUtils.cp fixtures("coffee-1.0.1.pre.spd"), "."
-    bpm "unpack", "coffee-1.0.1.pre.spd", "--target", "star/bucks"
+    FileUtils.cp fixtures("coffee-1.0.1.pre.bpkg"), "."
+    bpm "unpack", "coffee-1.0.1.pre.bpkg", "--target", "star/bucks"
 
     exit_status.should be_success
     output = stdout.read
@@ -33,9 +33,9 @@ describe "bpm unpack" do
   end
 
   it "can unpack more than one package" do
-    FileUtils.cp fixtures("coffee-1.0.1.pre.spd"), "."
-    FileUtils.cp fixtures("jquery-1.4.3.spd"), "."
-    bpm "unpack", "coffee-1.0.1.pre.spd", "jquery-1.4.3.spd"
+    FileUtils.cp fixtures("coffee-1.0.1.pre.bpkg"), "."
+    FileUtils.cp fixtures("jquery-1.4.3.bpkg"), "."
+    bpm "unpack", "coffee-1.0.1.pre.bpkg", "jquery-1.4.3.bpkg"
 
     exit_status.should be_success
     output = stdout.read
@@ -49,24 +49,24 @@ describe "bpm unpack" do
   it "shows a friendly error message if bpm can't write to the given directory" do
     FileUtils.mkdir_p(home("bad"))
     cd(home("bad"))
-    FileUtils.cp fixtures("jquery-1.4.3.spd"), "."
+    FileUtils.cp fixtures("jquery-1.4.3.bpkg"), "."
     FileUtils.chmod 0555, "."
-    bpm "unpack", "jquery-1.4.3.spd", :track_stderr => true
+    bpm "unpack", "jquery-1.4.3.bpkg", :track_stderr => true
 
     exit_status.should_not be_success
     output = stderr.read
-    output.should include("There was a problem unpacking jquery-1.4.3.spd:")
+    output.should include("There was a problem unpacking jquery-1.4.3.bpkg:")
     output.should include("Permission denied")
   end
 
   it "shows a friendly error message if bpm can't read the package" do
-    FileUtils.cp fixtures("jquery-1.4.3.spd"), "."
-    FileUtils.chmod 0000, "jquery-1.4.3.spd"
-    bpm "unpack", "jquery-1.4.3.spd", :track_stderr => true
+    FileUtils.cp fixtures("jquery-1.4.3.bpkg"), "."
+    FileUtils.chmod 0000, "jquery-1.4.3.bpkg"
+    bpm "unpack", "jquery-1.4.3.bpkg", :track_stderr => true
 
     exit_status.should_not be_success
     output = stderr.read
-    output.should include("There was a problem unpacking jquery-1.4.3.spd:")
+    output.should include("There was a problem unpacking jquery-1.4.3.bpkg:")
     output.should include("Permission denied")
   end
 end

data/spec/fixtures/custom_name/MyProject.json

@@ -0,0 +1,4 @@
+{
+  "name": "MyProject",
+  "bpm": "0.1.0"
+}

data/spec/fixtures/hello_world/css/dummy.css

@@ -0,0 +1,3 @@
+.hello-world {
+  font-size: 2.0em;
+}

data/spec/fixtures/minitest/assets/bpm_packages.js

@@ -0,0 +1 @@
+// TEST

data/spec/fixtures/minitest/assets/minitest/app_package.js

@@ -0,0 +1 @@
+// APP

data/spec/fixtures/minitest/lib/main.js

@@ -0,0 +1 @@
+// MAIN

data/spec/fixtures/minitest/minitest.json

@@ -0,0 +1,22 @@
+{
+  "name":         "minitest",
+  "version":      "2.0.0",
+  "bpm":          "0.1.0",
+
+  "description":  "DESCRIPTION HERE",
+  "author":       "YOUR NAME HERE",
+  "homepage":     "URL",
+
+  "directories": {
+    "lib":        "lib"
+  },
+
+  "dependencies": {
+    "uglyduck":    "1.0.0"
+  },
+  
+  "pipeline": {
+    "minifier": "uglyduck"
+  }
+  
+}

data/spec/fixtures/minitest/packages/uglyduck/lib/main.js

@@ -0,0 +1 @@
+//UGLY DUCK

data/spec/fixtures/minitest/packages/uglyduck/minifier/main.js

@@ -0,0 +1,4 @@
+
+exports.minify = function(body, pkg, moduleId, pathname) {
+  return "//MINIFIED START\n"+body+"\n//MINIFIED END\n";
+};

data/spec/fixtures/minitest/packages/uglyduck/package.json

@@ -0,0 +1,21 @@
+{
+  "name":         "uglyduck",
+  "version":      "1.0.0",
+  "bpm":          "0.1.0",
+
+  "description":  "DESCRIPTION HERE",
+  "author":       "YOUR NAME HERE",
+  "homepage":     "URL",
+
+  "directories": {
+    "lib":        "lib",
+    "minifier":   "minifier",
+    "test":       "tests"
+  },
+
+  "dependencies": {
+  },
+  
+  "plugin:minifier": "uglyduck/~minifier/main"
+  
+}

data/spec/fixtures/transporter/packages/transport/lib/main.js

@@ -0,0 +1 @@
+// TRANSPORT DEMO

data/spec/fixtures/transporter/packages/transport/package.json

@@ -16,6 +16,6 @@
     
   },
   
-  "plugin:transport": "transport/wrapper"
+  "plugin:transport": "transport/~transports/wrapper"
   
 }

data/spec/fixtures/transporter/packages/transport/transports/wrapper.js

@@ -0,0 +1,5 @@
+
+exports.compileTransport = function(body, pkg, moduleId, filename) {
+  return "define_transport(function() {\n"+body+"\n}), '"+pkg.name+"', '"+moduleId+"', '"+filename+"');";
+};
+

data/spec/gauntlet_spec.rb

@@ -25,8 +25,8 @@ describe "bpm build the gauntlet" do
       bpm "build"
 
       exit_status.should be_success
-      stdout.read.should include("Successfully built package: #{package}-#{version}.spd")
-      File.exist?(tmp.join(package, "#{package}-#{version}.spd"))
+      stdout.read.should include("Successfully built package: #{package}-#{version}.bpkg")
+      File.exist?(tmp.join(package, "#{package}-#{version}.bpkg"))
     end
   end
 =end

data/spec/package_spec.rb

@@ -91,8 +91,8 @@ describe BPM::Package, "#to_spec" do
     expand_sort(subject.test_files).should == expand_sort(test_files)
   end
 
-  it "hacks the file name to return .spd" do
-    subject.file_name.should == "core-test-0.4.9.spd"
+  it "hacks the file name to return .bpkg" do
+    subject.file_name.should == "core-test-0.4.9.bpkg"
   end
 
   it "sets the rubyforge_project to appease older versions of rubygems" do
@@ -122,7 +122,7 @@ describe BPM::Package, "converting" do
 
   subject do
     package = BPM::Package.new
-    package.bpkg = fixtures("core-test-0.4.9.spd")
+    package.bpkg = fixtures("core-test-0.4.9.bpkg")
     package.as_json
   end