bowline 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/bowline.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]

data/lib/bowline/initializer.rb

@@ -59,6 +59,7 @@ module Bowline
     end
     
     def initialize_ruby
+      return unless Bowline::Desktop.enabled?
       ruby_path = File.join(configuration.rubylib_path)
       unless File.directory?(ruby_path)
         ruby_path = Bowline::Library.rubylib_path
@@ -78,7 +79,7 @@ module Bowline
       require File.join(*%w[enc trans transdb])
       $:.uniq!
     end
-    
+        
     def require_frameworks
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
@@ -192,7 +193,6 @@ module Bowline
     end
     
     def initialize_gems
-      require 'rubygems'
       Gem.clear_paths
       Gem.path.unshift(configuration.gem_path)
     end

data/lib/bowline/library.rb

@@ -8,7 +8,7 @@ module Bowline
     
     def path
       File.expand_path(
-        File.join(Gem.user_home, ".bowline")
+        File.join(home_path, ".bowline")
       )
     end
     module_function :path
@@ -24,8 +24,26 @@ module Bowline
     module_function :rubylib_path
     
     def downloaded?
-      File.exist?(desktop_path) && File.directory?(rubylib_path)
+      File.exist?(desktop_path) && 
+        File.directory?(rubylib_path)
     end
     module_function :downloaded?
+    
+    private
+      # Borrowed from Rubygems
+      def home_path
+        ['HOME', 'USERPROFILE'].each do |homekey|
+          return ENV[homekey] if ENV[homekey]
+        end
+        if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
+          return "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
+        end
+        begin
+          File.expand_path("~")
+        rescue
+          File::ALT_SEPARATOR ? "C:/" : "/"
+        end
+      end
+      module_function :home_path
   end
 end

data/lib/bowline/tasks/libs.rake

@@ -24,7 +24,30 @@ def download(url)
 end
 
 namespace :libs do
-  task :download => :environment do
+  # Lots of people are using Ruby 1.8 with Bowline.
+  # When bowline-desktop loads, it doesn't know where the
+  # Bowline gem is if it's an 1.8 gem dir. So, we just symlink
+  # it to vendor/bowline. One caveat though, is that you have to
+  # re-run this task when you update the gem.
+  task :symlink_bowline => :environment do
+    local_path = File.join(APP_ROOT, "vendor", "bowline")
+    unless File.directory?(local_path)
+      begin
+        FileUtils.ln_s(
+          Bowline.lib_path, 
+          bowline_path
+        )
+      rescue NotImplemented
+        FileUtils.cp_r(
+          Bowline.lib_path,
+          bowline_path
+        )
+      end
+    end
+  end
+  
+  desc "Download Bowline's binary and pre-compiled libs"
+  task :download => [:environment, :symlink_bowline] do
     puts "Downloading libraries. This may take a while..."
     FileUtils.mkdir_p(Bowline::Library.path)
     
@@ -51,9 +74,9 @@ namespace :libs do
     puts "Finished downloading"
   end
   
+  desc "Update Bowline's binary and pre-compiled libs"
   task :update => :environment do
-    FileUtils.rm_rf(Bowline::Library.desktop_path)
-    FileUtils.rm_rf(Bowline::Library.rubylib_path)
+    FileUtils.rm_rf(Bowline::Library.path)
     Rake::Task["libs:download"].invoke
   end
 end

data/lib/bowline/version.rb

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

data/templates/config/boot.rb

@@ -1,19 +1,11 @@
 # Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
+# Configure your app in config/environment.rb
 
 APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined?(APP_ROOT)
+local_path = File.join(APP_ROOT, *%w{vendor bowline lib bowline.rb})
 
-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
+if File.exist?(local_path)
+  require local_path
 else
   require "rubygems"
   require "bowline"

data/templates/public/index.html

@@ -20,5 +20,6 @@
   </script>
 </head>
 <body>
+  <h1>Hello World from Bowline</h1>
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bowline
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Alex MacCaw