bpm 1.0.0.beta.13 → 1.0.0.rc.1

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+# 1.0.0.beta.14
+
+  * Switched from therubyracer to execjs, should provide Windows support
+  * Don't blow up when encountering invalid vendored packages
+  * Better error handling for CLI
+  * Added flag for easier debugging
+  * Allow packages to be put in vendor directory - Fixes #14
+  * Cleanup Package fields
+  * Allow packages to be developed in directories without matching names
+  * Fix prerelease flag for local packages - Fixes #16
+  * Bpm Init no longer changes folder name - Fixes #13
+  * Patched Sprockets directive bug
+
+# 1.0.0.beta.13
+
+  * Updated to latest LibGems with bug fixes
+  * Improved error messages
+
+# 1.0.0.beta.12
+
+  * Updated to Rack 1.3.2
+  * Removed old references to bpm:formats
+  * Added wiki link
+
+# 1.0.0.beta.11
+
+  * Moved JSON transport and minifiers into bpm:provides
+  * Documentation updates and fixes - Fixes #3
+  * Updated options and fixed tests
+
+# 1.0.0.beta.10
+
+  * Updated documentation
+  * Switched to GetBPM.org
 
 # 1.0.0.beta.9
 
@@ -68,4 +102,4 @@ New format for defining a format or transport plugin:
 # 1.0.0.beta.3.pre
 
   * started changelog
-  
+  

data/README.md

@@ -50,4 +50,4 @@ still incomplete.
 
 # Additional Documentation
 
-https://github.com/getbpm/bpm/wiki
+https://github.com/bpm/bpm/wiki

data/bin/bpm

@@ -4,5 +4,22 @@ $:.unshift(lib) if File.exists?(lib)
 
 require 'bpm'
 
-BPM::CLI::Base.start
+begin
+  BPM::CLI::Base.start
+rescue BPM::Error => e
+  raise e if ENV['DEBUG']
+  warn e.message
+  exit false
+rescue Interrupt => e
+  raise e if ENV['DEBUG']
+  puts "\nQuitting..."
+  exit false
+rescue SystemExit => e
+  exit e.status
+rescue Exception => e
+  warn "Unfortunately, a fatal error has occurred. " +
+    "Please report this error to the BPM issue tracker at " +
+    "https://github.com/bpm/bpm/issues so that we can fix it. Thanks!"
+  raise e
+end
 

data/bpm.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   mswin = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
   mri = !mswin && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
 
-  s.add_dependency "libgems",      "~> 0.1.0"
+  s.add_dependency "libgems",      "~> 0.1.3"
   s.add_dependency "gemcutter",    "~> 0.6.1"
   s.add_dependency "highline",     "~> 1.6.1"
   s.add_dependency "json_pure",    "~> 1.4.6"
   s.add_dependency "thor",         "~> 0.14.3"
-  s.add_dependency "therubyracer", "~> 0.9.3beta1"
-  s.add_dependency "sprockets",    "~> 2.0.0.beta.12"
+  s.add_dependency "execjs",       "~> 1.2.4"
+  s.add_dependency "sprockets",    "~> 2.0.0"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rack", "~> 1.3.2"

data/lib/bpm.rb

@@ -1,6 +1,9 @@
+Encoding.default_external = 'UTF-8'
+
 module BPM
   BPM_DIR = ".bpm"
   TEMPLATES_DIR = File.expand_path("../../templates", __FILE__)
+  ES5_SHIM_PATH = File.expand_path("../../support/es5-shim.js", __FILE__)
 
   autoload :CLI,                  'bpm/cli'
   autoload :Credentials,          'bpm/credentials'
@@ -18,7 +21,37 @@ module BPM
   autoload :PluginContext,        'bpm/pipeline/plugin_context'
   autoload :PackagePipeline,      'bpm/pipeline/package_pipeline'
   autoload :FormatProcessor,      'bpm/pipeline/format_processor'
-  autoload :PluginProcessor,        'bpm/pipeline/plugin_processor'
+  autoload :PluginProcessor,      'bpm/pipeline/plugin_processor'
+
+  def self.compile_js(data)
+    require 'bpm/execjs_ext'
+    @es5_shim ||= File.read(ES5_SHIM_PATH)
+    ExecJS.compile(@es5_shim+"\n"+data)
+  end
+
+  @@show_deprecations = false
+  @@deprecation_count = 0
+
+  def self.show_deprecations
+    @@show_deprecations
+  end
+
+  def self.show_deprecations=(val)
+    @@show_deprecations = val
+  end
+
+  def self.deprecation_count
+    @@deprecation_count
+  end
+
+  def self.deprecation_warning(message)
+    if show_deprecations
+      warn "[DEPRECATION] #{message}"
+    else
+      @@deprecation_count += 1
+    end
+  end
+
 end
 
 # The BPM constants need to be defined first

data/lib/bpm/cli/base.rb

@@ -16,7 +16,19 @@ module BPM
         shell.say "\nbpm (v#{BPM::VERSION}) - the browser package manager\n\n"
         super shell, subcommand
       end
-      
+
+      def self.start(given_args=ARGV, config={})
+        if given_args.include?('--verbose') || given_args.include?('-V')
+          BPM.show_deprecations = true
+        end
+
+        super
+
+        if BPM.deprecation_count > 0
+          puts "[WARN] #{BPM.deprecation_count} deprecation warnings were hidden. Run with --verbose to see them."
+        end
+      end
+
       desc "owner", "Manage users for a package"
       subcommand "owner", BPM::CLI::Owner
 
@@ -44,11 +56,11 @@ module BPM
               end
             end
           rescue LibGems::InstallError => e
-            abort "Fetch error: #{e}"
+            raise BPM::Error.new("Fetch error: #{e}")
           rescue LibGems::GemNotFoundException => e
             abort "Can't find package #{e.name} #{e.version} available for fetch"
           rescue Errno::EACCES, LibGems::FilePermissionError => e
-            abort e.message
+            raise BPM::Error.new(e.message)
           end
         end
       end
@@ -78,7 +90,7 @@ module BPM
 
           deps = {}
           package_names.each do |name|
-            vers = options[:version] || (options[:prerelease] ? '>= 0-pre' : '>= 0')
+            vers = options[:version] || (options[:prerelease] ? '>= 0.pre' : '>= 0')
             if name =~ /^(.+?)(-(\d[\w\.]*))?\.bpkg$/
               name = $1
               vers = $3 if $3
@@ -90,12 +102,8 @@ module BPM
         # find project
         project = find_project
 
-        begin
-          project.add_dependencies deps, options[:development], true
-          project.build options[:mode], true
-        rescue BPM::Error => e
-          abort e.message
-        end
+        project.add_dependencies deps, options[:development], true
+        project.build options[:mode], true
       end
 
       desc "remove [PACKAGE]", "Remove one or more packages from a bpm project"
@@ -108,14 +116,10 @@ module BPM
           abort "You must specify at least one package"
         end
 
-        begin
-          project = find_project
-          project.unbuild options[:verbose]
-          project.remove_dependencies package_names, true
-          project.build options[:mode], true
-        rescue BPM::Error => e
-          abort e.message
-        end
+        project = find_project
+        project.unbuild options[:verbose]
+        project.remove_dependencies package_names, true
+        project.build options[:mode], true
       end
 
       desc "preview", "Preview server that will autocompile assets as you request them.  Useful for hacking"
@@ -127,7 +131,7 @@ module BPM
         project.verify_and_repair options[:mode], options[:verbose]
         BPM::Server.start project, :Port => options[:port], :mode => options[:mode].to_sym
       end
-      
+
       desc "rebuild", "Rebuilds bpm assets, does not update versions"
       method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => 'Build mode for compile'
       method_option :project,    :type => :string,  :default => nil, :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
@@ -135,10 +139,8 @@ module BPM
       def rebuild
         find_project.fetch_dependencies(true) if options[:update]
         find_project.build options[:mode].to_sym, true
-      rescue BPM::Error => e
-        abort e.message
       end
-      
+
       desc "login", "Log in with your BPM credentials"
       method_option :username,  :type => :string,  :default => nil, :aliases => ['-u'], :desc => 'Specify the username to login as'
       method_option :password,  :type => :string,  :default => nil, :aliases => ['-p'], :desc => 'Specify the login password'
@@ -224,7 +226,7 @@ module BPM
           packages = nil if packages.size == 0
           project  = find_project
           project.verify_and_repair
-          
+
           deps = options[:development] ? project.sorted_development_deps : project.sorted_runtime_deps
           deps.each do |dep|
             next if packages && !packages.include?(dep.name)
@@ -249,11 +251,11 @@ module BPM
         paths.each do |path|
           name = options[:name] || File.basename(path)
 
-          # if someone specified both a name and path assume they meant 
-          # exactly what they said and don't normalize it.
+          # if someone specified both a name and path assume they meant
+          # exactly what they said
           if name == File.basename(path)
-            underscored = File.join(File.dirname(path), underscore(File.basename(path)))
-            path = underscored if !File.directory?(path)
+            new_path = File.join(File.dirname(path), File.basename(path))
+            path = new_path if !File.directory?(path)
           end
 
           if File.directory?(path)
@@ -266,11 +268,7 @@ module BPM
             success = generator.new(self, name, path, template_path, package).run
             run_init(name, true, path, package) if success
           end
-          
         end
-      
-      rescue BPM::Error => e
-        abort e.message
       end
 
       desc "pack [PACKAGE]", "Build a bpm package from a package.json"
@@ -289,8 +287,6 @@ module BPM
           end
           abort failure_message
         end
-      rescue BPM::Error => e
-        abort e.message
       end
 
       desc "unpack [PACKAGE]", "Extract files from a bpm package"
@@ -334,7 +330,7 @@ module BPM
 
         def run_init(name, include_app, path, package=nil)
 
-          # we only need to create a new project.json if one does not 
+          # we only need to create a new project.json if one does not
           # already exist.
           unless BPM::Project.is_project_root? path
             template_path = package ? package.template_path(:init) : nil
@@ -379,10 +375,10 @@ module BPM
               abort "You do not appear to be inside of a bpm project"
             end
           end
-          
+
           project
         end
-        
+
         def print_specs(names, index)
           packages = {}
 
@@ -414,14 +410,6 @@ module BPM
           BPM::Package.from_spec(spec)
         end
 
-        def underscore(str)
-          str.gsub(/::/, '/').
-            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-            gsub(/([a-z\d])([A-Z])/,'\1_\2').
-            tr("-", "_").
-            downcase
-        end
-
     end
   end
 end

data/lib/bpm/errors.rb

@@ -14,11 +14,16 @@ module BPM
   class InvalidPackageError < BPM::Error
     def format_message(package, msg=nil)
       msg = msg.nil? ? '' : ": #{msg}"
-      "There was a problem parsing #{File.basename(package.json_path)}#{msg}"
+      path = begin
+        Pathname.new(package.json_path).relative_path_from(Pathname.new(Dir.pwd))
+      rescue
+        package.json_path
+      end
+      "There was a problem parsing #{path}#{msg}"
     end
   end
   
-  class InvalidPackageNameError < BPM::InvalidPackageError
+  class InvalidPackagePathError < BPM::InvalidPackageError
     def format_message(package)
       "Package at #{package.root_path} name and directory do not match. (name: #{package.name}).  Change the directory or package.json name to match."
     end
@@ -55,5 +60,12 @@ module BPM
 EOF
     end
   end
-  
+
+  class CircularDependencyError < BPM::Error
+    def initialize(original)
+      set_backtrace(original.backtrace)
+      super(original.message)
+    end
+  end
+
 end

data/lib/bpm/execjs_ext.rb

@@ -0,0 +1,99 @@
+require 'execjs'
+
+# The following is backported from ExecJS master (post 1.2.4)
+# Once 1.2.5 is released, we can remove this
+
+module ExecJS
+  class ExternalRuntime
+    def initialize(options)
+      @name        = options[:name]
+      @command     = options[:command]
+      @runner_path = options[:runner_path]
+      @test_args   = options[:test_args]
+      @test_match  = options[:test_match]
+      @encoding    = options[:encoding]
+      @binary      = locate_binary
+    end
+
+    def exec_runtime(filename)
+      output = sh("#{@binary} #{filename} 2>&1")
+      if $?.success?
+        output
+      else
+        raise RuntimeError, output
+      end
+    end
+
+    protected
+
+      def which(command)
+        Array(command).each do |name|
+          name, args = name.split(/\s+/, 2)
+          result = if ExecJS.windows?
+            `"#{ExecJS.root}/support/which.bat" #{name}`
+          else
+            `command -v #{name} 2>/dev/null`
+          end
+
+          if path = result.strip.split("\n").first
+            return args ? "#{path} #{args}" : path
+          end
+        end
+        nil
+      end
+
+      if "".respond_to?(:force_encoding)
+        def sh(command)
+          output, options = nil, {}
+          options[:internal_encoding] = 'UTF-8'
+          options[:external_encoding] = @encoding if @encoding
+          IO.popen(command, options) { |f| output = f.read }
+          output
+        end
+      else
+        require "iconv"
+
+        def sh(command)
+          output = nil
+          IO.popen(command) { |f| output = f.read }
+
+          if @encoding
+            Iconv.new('UTF-8', @encoding).iconv(output)
+          else
+            output
+          end
+        end
+      end
+  end
+
+  module Runtimes
+    remove_const :JavaScriptCore
+    JavaScriptCore = ExternalRuntime.new(
+      :name        => "JavaScriptCore",
+      :command     => ["/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc", "jsc"],
+      :runner_path => ExecJS.root + "/support/jsc_runner.js"
+    )
+
+    remove_const :JScript
+    JScript = ExternalRuntime.new(
+      :name        => "JScript",
+      :command     => "cscript //E:jscript //Nologo //U",
+      :runner_path => ExecJS.root + "/support/jscript_runner.js",
+      :encoding    => 'UTF-16LE' # CScript with //U returns UTF-16LE
+    )
+    
+    instance_variable_set(:@runtimes, [
+      RubyRacer,
+      RubyRhino,
+      Johnson,
+      Mustang,
+      Node,
+      JavaScriptCore,
+      SpiderMonkey,
+      JScript
+    ])
+  end
+
+  self.runtime = Runtimes.autodetect
+  
+end