maccman-bowline 0.3.7 → 0.3.9

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.9

data/bowline.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.3.7"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
      "lib/bowline/dependencies/lib/dependencies/dependency.rb",
      "lib/bowline/dependencies/lib/dependencies/reader.rb",
      "lib/bowline/dependencies/lib/dependencies/repository.rb",
-     "lib/bowline/dependencies/lib/ext/common.rb",
      "lib/bowline/dependencies/lib/ext/rubygems.rb",
      "lib/bowline/dependencies/lib/template/app_script.rb",
      "lib/bowline/dependencies/spec/spec.opts",

data/lib/bowline/initializer.rb

@@ -183,10 +183,11 @@ module Bowline
         options = {
           :lib => dep.name
         }.merge(dep.options)
-
+        
+        next unless options[:lib]
         begin
-          activated = gem(dep.name, *dep.versions)
-          require(options[:lib]) if activated && options[:lib]
+          gem(dep.name, *dep.versions)
+          require(options[:lib])
         rescue LoadError => e
           puts "was unable to require #{dep.name} as '#{options[:lib]}'
           Reason: #{e.class.name} error raised with message: #{e.message}"

data/lib/bowline/version.rb

@@ -2,7 +2,7 @@ module Bowline
   module Version #:nodoc:
     MAJOR    = 0
     MINOR    = 3
-    TINY     = 7
+    TINY     = 9
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maccman-bowline
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -75,7 +75,6 @@ files:
 - lib/bowline/dependencies/lib/dependencies/dependency.rb
 - lib/bowline/dependencies/lib/dependencies/reader.rb
 - lib/bowline/dependencies/lib/dependencies/repository.rb
-- lib/bowline/dependencies/lib/ext/common.rb
 - lib/bowline/dependencies/lib/ext/rubygems.rb
 - lib/bowline/dependencies/lib/template/app_script.rb
 - lib/bowline/dependencies/spec/spec.opts

data/lib/bowline/dependencies/lib/ext/common.rb

@@ -1,68 +0,0 @@
-# This was added via Merb's bundler
-
-require "rubygems"
-require "rubygems/source_index"
-
-module Gem
-  BUNDLED_SPECS = File.join(Dir.pwd, "gems", "specifications")
-  MAIN_INDEX = Gem::SourceIndex.from_gems_in(BUNDLED_SPECS)
-  FALLBACK_INDEX = Gem::SourceIndex.from_installed_gems
-  
-  def self.source_index
-    MultiSourceIndex.new
-  end
-  
-  def self.searcher
-    MultiPathSearcher.new
-  end
-  
-  class ArbitrarySearcher < GemPathSearcher
-    def initialize(source_index)
-      @source_index = source_index
-      super()
-    end
-    
-    def init_gemspecs
-      @source_index.map { |_, spec| spec }.sort { |a,b|
-        (a.name <=> b.name).nonzero? || (b.version <=> a.version)
-      }
-    end
-  end
-
-  class MultiPathSearcher
-    def initialize
-      @main_searcher = ArbitrarySearcher.new(MAIN_INDEX)
-      @fallback_searcher = ArbitrarySearcher.new(FALLBACK_INDEX)
-    end
-    
-    def find(path)
-      try = @main_searcher.find(path)
-      return try if try
-      @fallback_searcher.find(path)
-    end
-    
-    def find_all(path)
-      try = @main_searcher.find_all(path)
-      return try unless try.empty?
-      @fallback_searcher.find_all(path)
-    end
-  end
-  
-  class MultiSourceIndex
-    # Used by merb.thor to confirm; not needed when MSI is in use
-    def load_gems_in(*args)
-    end
-    
-    def search(*args)
-      try = MAIN_INDEX.search(*args)
-      return try unless try.empty?
-      FALLBACK_INDEX.search(*args)
-    end
-    
-    def find_name(*args)
-      try = MAIN_INDEX.find_name(*args)
-      return try unless try.empty?
-      FALLBACK_INDEX.find_name(*args)
-    end
-  end
-end