bowline 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/bowline.gemspec

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

data/lib/bowline/commands/build.rb

@@ -1,3 +1,2 @@
-require 'rake'
 require 'bowline/tasks/bowline'
 Rake::Task['app:build'].invoke

data/lib/bowline/commands/run.rb

@@ -1,7 +1,6 @@
-unless Bowline::Library.downloaded?
-  require 'rake'
+unless Bowline::Library.ready?
   require 'bowline/tasks/bowline'
-  Rake::Task['libs:download'].invoke
+  Rake::Task['libs:setup'].invoke
 end
 
 exec("#{Bowline::Library.desktop_path} #{APP_ROOT}")

data/lib/bowline/generators/application.rb

@@ -50,7 +50,7 @@ module Bowline::Generators
     empty_directory :binders, "app/binders"
     empty_directory :helpers, "app/helpers"
     empty_directory :windows, "app/windows"
-    file :mainwindow, "main_window.rb", "app/windows"
+    file :mainwindow, "main_window.rb", "app/windows/main_window.rb"
     
     empty_directory :config, "config"
     template :environment, "config/environment.rb", "config/environment.rb"

data/lib/bowline/library.rb

@@ -23,11 +23,17 @@ module Bowline
     end
     module_function :rubylib_path
     
-    def downloaded?
+    def bowline_path
+      File.join(APP_ROOT, "vendor", "bowline")
+    end
+    module_function :bowline_path
+    
+    def ready?
       File.exist?(desktop_path) && 
-        File.directory?(rubylib_path)
+        File.directory?(rubylib_path) && 
+          File.directory?(bowline_path)
     end
-    module_function :downloaded?
+    module_function :ready?
     
     private
       # Borrowed from Rubygems

data/lib/bowline/tasks/app.rake

@@ -5,8 +5,8 @@ require 'rbconfig'
 namespace :app do  
   namespace :build do
     task :osx => :environment do
-      unless Bowline::Library.downloaded?
-        Rake::Task["libs:download"].invoke
+      unless Bowline::Library.ready?
+        Rake::Task["libs:setup"].invoke
       end
       
       config = Bowline.configuration

data/lib/bowline/tasks/bowline.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'rake'
+
 $VERBOSE = nil
 
 # Load Rails rakefile extensions

data/lib/bowline/tasks/libs.rake

@@ -11,7 +11,7 @@ def download(url)
   req  = Net::HTTP::Get.new(url.path)
   res  = Net::HTTP.start(url.host, url.port) {|http|
     http.request(req) {|resp|
-      pbar = ProgressBar.new(name, resp.content_length)
+      pbar = ProgressBar.new("Downloading...", resp.content_length)
       resp.read_body {|seg|
         pbar.inc(seg.length)
         file.write(seg)
@@ -23,35 +23,45 @@ def download(url)
   file
 end
 
+def unzip(fpath, tpath)
+  Zip::ZipFile.open(fpath) { |zfile|
+    zfile.each {|file|
+      file_path = File.join(tpath, file.name)
+      FileUtils.mkdir_p(File.dirname(file_path))
+      zfile.extract(file, file_path)
+    }
+  }
+end
+
 namespace :libs 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")
+  task :unpack => :environment do
+    local_path = Bowline::Library.bowline_path
     unless File.directory?(local_path)
       begin
         FileUtils.ln_s(
           Bowline.lib_path, 
-          bowline_path
+          local_path
         )
-      rescue NotImplemented
+      rescue NotImplementedError
         FileUtils.cp_r(
           Bowline.lib_path,
-          bowline_path
+          local_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..."
+  task :download => :environment do
     FileUtils.mkdir_p(Bowline::Library.path)
-    
     desktop_path = Bowline::Library.desktop_path
+    rubylib_path = Bowline::Library.rubylib_path
+    
     unless File.exist?(desktop_path)
       desktop_tmp = download(Bowline::Library::DESKTOP_URL)
       desktop_tmp.close
@@ -59,24 +69,20 @@ namespace :libs do
       FileUtils.chmod(0755, desktop_path)
     end
     
-    unless File.directory?(Bowline::Library.rubylib_path)
+    unless File.directory?(rubylib_path)
       rubylib_tmp = download(Bowline::Library::RUBYLIB_URL)
       rubylib_tmp.close
       puts "Extracting..."
-      Zip::ZipFile.open(rubylib_tmp.path) { |zfile|
-        zfile.each {|file|
-          file_path = File.join(Bowline::Library.path, file.name)
-          FileUtils.mkdir_p(File.dirname(file_path))
-          zfile.extract(file, file_path)
-        }
-      }
+      unzip(rubylib_tmp.path, Bowline::Library.path)
     end
-    puts "Finished downloading"
   end
+    
+  task :setup => [:environment, "gems:sync", "libs:unpack", "libs:download"]
   
   desc "Update Bowline's binary and pre-compiled libs"
   task :update => :environment do
     FileUtils.rm_rf(Bowline::Library.path)
-    Rake::Task["libs:download"].invoke
+    FileUtils.rm_rf(Bowline::Library.bowline_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     = 1
+    TINY     = 2
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     

metadata

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