bowline 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/bowline.gemspec

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

data/lib/bowline/initializer.rb

@@ -60,7 +60,7 @@ module Bowline
     
     def initialize_ruby
       return unless Bowline::Desktop.enabled?
-      ruby_path = File.join(configuration.rubylib_path)
+      ruby_path = Bowline::Library.local_rubylib_path
       unless File.directory?(ruby_path)
         ruby_path = Bowline::Library.rubylib_path
         return unless File.directory?(ruby_path)
@@ -434,9 +434,7 @@ module Bowline
      end
      
      attr_accessor :gem_path
-     
-     attr_accessor :rubylib_path
-     
+          
      # Sets the default +time_zone+.  Setting this will enable +time_zone+
      # awareness for Active Record models and set the Active Record default
      # timezone to <tt>:utc</tt>.
@@ -477,7 +475,6 @@ module Bowline
        self.app_config_file              = default_app_config_file
        self.gems                         = default_gems
        self.gem_path                     = default_gem_path
-       self.rubylib_path                 = default_rubylib_path
        self.plugin_glob                  = default_plugin_glob
        self.helper_glob                  = default_helper_glob
        self.initializer_glob             = default_initalizer_glob
@@ -613,11 +610,7 @@ module Bowline
        )
        gems
      end
-     
-     def default_rubylib_path
-       File.join(root_path, *%w{ vendor rubylib })
-     end
-     
+          
      def default_gem_path
        File.join(root_path, *%w{ vendor gems })
      end

data/lib/bowline/library.rb

@@ -23,15 +23,20 @@ module Bowline
     end
     module_function :rubylib_path
     
-    def bowline_path
+    def local_bowline_path
       File.join(APP_ROOT, "vendor", "bowline")
     end
-    module_function :bowline_path
+    module_function :local_bowline_path
+    
+    def local_rubylib_path
+      File.join(APP_ROOT, "vendor", "rubylib")
+    end
+    module_function :local_rubylib_path
     
     def ready?
       File.exist?(desktop_path) && 
         File.directory?(rubylib_path) && 
-          File.directory?(bowline_path)
+          File.directory?(local_bowline_path)
     end
     module_function :ready?
     

data/lib/bowline/tasks/app.rake

@@ -48,21 +48,30 @@ namespace :app do
           dirs.delete(File.join(APP_ROOT, 'db', 'migrate'))
           dirs.delete_if {|i| i =~ /\.svn|\.DS_Store/ }
           FileUtils.cp_r(dirs, '.')
-
-          # Copy Bowline
-          bowline_dir = File.join("vendor", "bowline")
-          FileUtils.rm_rf(bowline_dir)
-          FileUtils.cp_r(
-            Pathname.new(Bowline.lib_path).realpath, 
-            bowline_dir
-          )
           
-          # Copy RB libs - TODO
-          FileUtils.mkdir_p(config.rubylib_path)
-          FileUtils.cp_r(Bowline::Library.rubylib_path, config.rubylib_path)
+          FileUtils.mkdir_p("vendor")
+          FileUtils.cd("vendor") do
+            # Copy Bowline lib
+            bowline_path = "bowline"
+            FileUtils.rm_rf(bowline_path)
+            FileUtils.cp_r(
+              Pathname.new(Bowline.lib_path).realpath, 
+              bowline_path
+            )
+            %w{assets pkg examples bin templates .git}.each do |unused|
+              FileUtils.rm_rf(File.join(bowline_path, unused))
+            end
+            
+            rubylib_path = "rubylib"
+            FileUtils.rm_rf(rubylib_path)
+            FileUtils.cp_r(
+              Bowline::Library.rubylib_path, 
+              rubylib_path
+            )
+          end
         end
         
-        # Copy Binary
+        # Copy Bowline binary
         FileUtils.mkdir("MacOS")
         FileUtils.cp(
           Bowline::Library.desktop_path, 

data/lib/bowline/tasks/libs.rake

@@ -40,7 +40,7 @@ namespace :libs do
   # it to vendor/bowline. One caveat though, is that you have to
   # re-run this task when you update the gem.
   task :unpack => :environment do
-    local_path = Bowline::Library.bowline_path
+    local_path = Bowline::Library.local_bowline_path
     unless File.directory?(local_path)
       begin
         FileUtils.ln_s(
@@ -82,7 +82,8 @@ namespace :libs do
   desc "Update Bowline's binary and pre-compiled libs"
   task :update => :environment do
     FileUtils.rm_rf(Bowline::Library.path)
-    FileUtils.rm_rf(Bowline::Library.bowline_path)
+    FileUtils.rm_rf(Bowline::Library.local_bowline_path)
+    FileUtils.rm_rf(Bowline::Library.local_rubylib_path)
     Rake::Task["libs:setup"].invoke
   end
 end

data/lib/bowline/version.rb

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

metadata

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