maccman-bowline 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/bowline.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2009-07-22}
+  s.date = %q{2009-07-23}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
      "lib/bowline/dependencies/lib/dependencies/dependency.rb",
      "lib/bowline/dependencies/lib/dependencies/repository.rb",
      "lib/bowline/dependencies/lib/ext/rubygems.rb",
-     "lib/bowline/dependencies/lib/template/app_script.rb",
      "lib/bowline/ext/array.rb",
      "lib/bowline/ext/class.rb",
      "lib/bowline/ext/object.rb",
@@ -91,7 +90,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/maccman/bowline}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Bowline GUI framework}
   s.test_files = [
     "examples/account.rb",

data/lib/bowline/dependencies/lib/dependencies.rb

@@ -1,9 +1,5 @@
 module Dependencies; end
 
-Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |file|
-  require file
-end
-
 Dir[File.join(File.dirname(__FILE__), 'dependencies', '*.rb')].each do |file|
   require file
 end

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

@@ -1,14 +1,13 @@
 require 'erb'
 require 'rubygems'
+require 'rubygems/uninstaller'
 require 'rubygems/dependency_installer'
 
-Gem.pre_install_hooks.push(proc do |installer|
-  unless File.file?(File.join(installer.bin_dir, "common.rb"))
-    FileUtils.mkdir_p(installer.bin_dir)
-    FileUtils.cp(File.join(File.dirname(__FILE__), "common.rb"),
-                 File.join(installer.bin_dir,      "common.rb"))
-  end
+# We only require this in 'rake gems:sync' since
+# it contains some advanced Gem features that aren't
+# available in earlier versions, such as pre_install_hooks
 
+Gem.pre_install_hooks.push(proc do |installer|
   name = installer.spec.name
 
   puts "+ #{name}"
@@ -103,14 +102,6 @@ class ::Gem::SpecFetcher
   end
 end
 
-class ::Gem::Installer
-  def app_script_text(bin_file_name)
-    template = File.read(File.join(File.dirname(__FILE__), '..', 'template' , "app_script.rb"))
-    erb = ERB.new(template)
-    erb.result(binding)
-  end
-end
-
 class ::Gem::Specification
   def recursive_dependencies(from, index = Gem.source_index)
     specs = self.runtime_dependencies.map do |dep|
@@ -122,4 +113,4 @@ class ::Gem::Specification
     end
     specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq
   end
-end
+end

data/lib/bowline/tasks/gems.rake

@@ -1,6 +1,8 @@
 namespace :gems do
   desc "Install gems locally"
   task :sync => [:environment] do
+    require 'bowline/dependencies/lib/ext/rubygems'
+    
     conf = Bowline.configuration
     repo = Dependencies::Repository.new(
       conf.gem_path

data/lib/bowline/version.rb

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

data/templates/config/boot.rb

@@ -3,8 +3,14 @@
 
 APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined?(APP_ROOT)
 
-gems_path    = File.join(APP_ROOT, *%w{vendor gems gems})
-bowline_path = Dir[File.join(gems_path, *%w{{maccman-bowline*,bowline*} lib bowline.rb})][-1]
+edge_path = File.join(APP_ROOT, *%w{vendor bowline lib bowline.rb})
+
+if File.exist?(edge_path)
+  bowline_path = edge_path
+else
+  gems_path    = File.join(APP_ROOT, *%w{vendor gems gems})
+  bowline_path = Dir[File.join(gems_path, *%w{{maccman-bowline*,bowline*} lib bowline.rb})][-1]
+end
 
 if bowline_path
   require bowline_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maccman-bowline
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ files:
 - lib/bowline/dependencies/lib/dependencies/dependency.rb
 - lib/bowline/dependencies/lib/dependencies/repository.rb
 - lib/bowline/dependencies/lib/ext/rubygems.rb
-- lib/bowline/dependencies/lib/template/app_script.rb
 - lib/bowline/ext/array.rb
 - lib/bowline/ext/class.rb
 - lib/bowline/ext/object.rb

data/lib/bowline/dependencies/lib/template/app_script.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-# This was added by Merb's bundler
-
-require "rubygems"
-require File.join(File.dirname(__FILE__), "common")
-
-gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')
-
-if File.directory?(gems_dir)
-  $BUNDLE = true
-  Gem.clear_paths
-  Gem.path.replace([File.expand_path(gems_dir)])
-  ENV["PATH"] = "#{File.dirname(__FILE__)}:#{ENV["PATH"]}"
-  
-  gem_file = File.join(gems_dir, "specifications", "<%= spec.name %>-*.gemspec")
-  
-  if local_gem = Dir[gem_file].last
-    version = File.basename(local_gem)[/-([\.\d]+)\.gemspec$/, 1]
-  end
-end
-
-version ||= "<%= Gem::Requirement.default %>"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem '<%= @spec.name %>', version
-load '<%= bin_file_name %>'