bowline 0.9.3 → 0.9.4

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gemspec.description = "Ruby/JS GUI framework"
     gemspec.authors = ["Alex MacCaw"]
     gemspec.add_dependency('templater',      '>= 0.3.2')
-    gemspec.add_dependency('activesupport',  '>= 3.0.0.beta')
+    gemspec.add_dependency('activesupport',  '>= 3.0.0.beta4')
     gemspec.add_dependency('rubyzip2',       '>= 2.0.1')
     gemspec.add_dependency('supermodel',     '>= 0.1.3')
     gemspec.add_dependency('bowline-bundler','>= 0.0.1')
@@ -29,7 +29,7 @@ rescue LoadError
 end
 
 task :write_version do 
-  require File.join(File.dirname(__FILE__), *%w[lib bowline])
+  require File.expand_path(File.join(File.dirname(__FILE__), *%w[lib bowline]))
   File.open('VERSION', 'w') {|f| f.write Bowline::Version::STRING }
 end
 

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/bin/bowline-gen

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), *%w[.. lib bowline])
+require File.join(File.expand_path(File.dirname(__FILE__)), *%w[.. lib bowline])
 require 'bowline/generators'
 
 Bowline::Generators.run_cli(Dir.pwd, 'bowline', Bowline::Version::STRING, ARGV)

data/bowline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-09-24}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -130,7 +130,7 @@ Gem::Specification.new do |s|
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Bowline GUI framework}
   s.test_files = [
     "examples/tweet.rb",
@@ -142,22 +142,22 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<templater>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
       s.add_runtime_dependency(%q<rubyzip2>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<supermodel>, [">= 0.1.3"])
       s.add_runtime_dependency(%q<bowline-bundler>, [">= 0.0.1"])
     else
       s.add_dependency(%q<templater>, [">= 0.3.2"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
       s.add_dependency(%q<rubyzip2>, [">= 2.0.1"])
       s.add_dependency(%q<supermodel>, [">= 0.1.3"])
       s.add_dependency(%q<bowline-bundler>, [">= 0.0.1"])
     end
   else
     s.add_dependency(%q<templater>, [">= 0.3.2"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
     s.add_dependency(%q<rubyzip2>, [">= 2.0.1"])
     s.add_dependency(%q<supermodel>, [">= 0.1.3"])
     s.add_dependency(%q<bowline-bundler>, [">= 0.0.1"])

data/lib/bowline/desktop/bridge.rb

@@ -67,6 +67,8 @@ module Bowline
         end
 
         def invoke
+          debug "JS invoking: #{klass}.#{method_name}(#{args.join(',')})"
+
           if klass == "_window"
             object = window
           else
@@ -74,8 +76,6 @@ module Bowline
             object = klass.constantize
           end
 
-          debug "JS invoking: #{klass}.#{method_name}(#{args.join(',')})"
-
           if object.respond_to?(:js_exposed?) && 
               object.js_exposed?(method_name)
             

data/lib/bowline/generators.rb

@@ -103,7 +103,7 @@ module Bowline
       end
       
       def self.source_root
-        File.join(File.dirname(__FILE__), *%w[.. .. templates])
+        File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. templates]))
       end
     end
     

data/lib/bowline/initializer.rb

@@ -91,7 +91,7 @@ module Bowline
     end
     
     def set_load_path
-      load_paths = configuration.load_paths
+      load_paths = configuration.autoload_paths
       load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
       $LOAD_PATH.uniq!
     end
@@ -110,27 +110,22 @@ module Bowline
     # Set the paths from which Bowline will automatically load source files, and
     # the load_once paths.
     def set_autoload_paths
-      ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
-      ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
-
-      extra = ActiveSupport::Dependencies.load_once_paths - ActiveSupport::Dependencies.load_paths
-      unless extra.empty?
-        abort <<-end_error
-          load_once_paths must be a subset of the load_paths.
-          Extra items in load_once_paths: #{extra * ','}
-        end_error
+      # Rails 3 master support
+      if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+        ActiveSupport::Dependencies.autoload_paths      = configuration.autoload_paths.uniq
+        ActiveSupport::Dependencies.autoload_once_paths = configuration.autoload_once_paths.uniq
+      else
+        ActiveSupport::Dependencies.load_paths      = configuration.autoload_paths.uniq
+        ActiveSupport::Dependencies.load_once_paths = configuration.autoload_once_paths.uniq        
       end
-
-      # Freeze the arrays so future modifications will fail rather than do nothing mysteriously
-      configuration.load_once_paths.freeze
     end
     
     def add_plugin_load_paths
       Dir.glob(File.join(configuration.plugin_glob, 'lib')).sort.each do |path|
         $LOAD_PATH << path
-        ActiveSupport::Dependencies.load_paths << path
+        ActiveSupport::Dependencies.autoload_paths << path
         unless configuration.reload_plugins?
-          ActiveSupport::Dependencies.load_once_paths << path
+          ActiveSupport::Dependencies.autoload_once_paths << path
         end
       end
       $LOAD_PATH.uniq!
@@ -242,7 +237,7 @@ module Bowline
     def load_application_first_run
       first_run = Bowline.root.join("app_first_run")
       if first_run.exist?
-        first_run.unlink
+        first_run.unlink if Bowline.root.writable_real?
         Dir.glob(configuration.first_run_glob).sort.each do |initializer|
           load(initializer)
         end
@@ -413,15 +408,15 @@ module Bowline
      
      # An array of additional paths to prepend to the load path. By default,
      # all +app+, +lib+, +vendor+ and mock paths are included in this list.
-     attr_accessor :load_paths
+     attr_accessor :autoload_paths
 
      # An array of paths from which Bowline will automatically load from only once.
      # All elements of this array must also be in +load_paths+.
-     attr_accessor :load_once_paths
+     attr_accessor :autoload_once_paths
      
      # An array of paths from which Bowline will eager load on boot if cache
      # classes is enabled. All elements of this array must also be in
-     # +load_paths+.
+     # +autoload_paths+.
      attr_accessor :eager_load_paths
      
      # The log level to use for the default Bowline logger. 
@@ -498,8 +493,8 @@ module Bowline
        set_root_path!
        
        self.frameworks                   = default_frameworks
-       self.load_paths                   = default_load_paths
-       self.load_once_paths              = default_load_once_paths
+       self.autoload_paths               = default_autoload_paths
+       self.autoload_once_paths          = default_autoload_once_paths
        self.dependency_loading           = default_dependency_loading
        self.eager_load_paths             = default_eager_load_paths
        self.log_path                     = default_log_path
@@ -572,7 +567,7 @@ module Bowline
        [:active_support, :bowline]
      end
         
-     def default_load_paths
+     def default_autoload_paths
        paths = []
 
        # Followed by the standard includes.
@@ -591,7 +586,7 @@ module Bowline
      end
      
      # Doesn't matter since plugins aren't in load_paths yet.
-     def default_load_once_paths
+     def default_autoload_once_paths
        []
      end
      

data/lib/bowline/tasks/app.rake

@@ -19,16 +19,12 @@ namespace :app do
       app_path    = File.join(build_path, "#{config.name}.zip")
       FileUtils.rm_rf(app_path)
       
-      dirs = Dir[Bowline.root.join("**").to_s]
-      dirs.delete(build_path.to_s)
-      dirs.delete(Bowline.root.join("log").to_s)
-      dirs.delete(Bowline.root.join(*%w{db migrate}).to_s)
-      dirs.delete_if {|i| i =~ /\.svn|\.DS_Store|\.git/ }
+      dirs = Dir["#{Bowline.root.to_s}/**/**"]
 
-      bundle_dir = Bowline.root.join(".bundle")
-      dirs += bundle_dir if bundle_dir.exist?
-      
-      dirs = Dir[*dirs.map {|d| "#{d}/**/**" }]
+      dirs.delete_if {|d| d.include?(build_path.to_s) }
+      dirs.delete_if {|d| d.include?(Bowline.root.join("log").to_s) }
+      dirs.delete_if {|d| d.include?(Bowline.root.join(*%w{db migrate}).to_s) }      
+      dirs.delete_if {|i| i =~ /\.svn|\.DS_Store|\.git/ }
       
       Zip::ZipFile.open(app_path, Zip::ZipFile::CREATE) do |zf|
         # This is horrible - but RubyZIP's API sucks

data/lib/bowline/version.rb

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

data/templates/Gemfile

@@ -2,6 +2,7 @@
 source 'http://rubygems.org'
 
 gem "bowline"
+gem "tzinfo"
 
 ## Bundle the gems you use:
 # gem "bj"

data/templates/Rakefile

@@ -1,7 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/foo.rake, and they will automatically be available to Rake.
 
-require File.join(File.dirname(__FILE__), *%w[config boot])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[config boot]))
 
 require 'rake'
 require 'bowline/tasks/bowline'

data/templates/config/boot.rb

@@ -8,9 +8,8 @@ if File.exist?("#{environment}.rb")
   require environment
 
 # Use RubyGems
-else  
-  require "bowline/bundler"
-  Bundler.setup
+else
+  abort "Please run 'bowline-bundle install'"
 end
 
 require "bowline"

data/templates/config/environment.rb

@@ -1,5 +1,5 @@
 # Bootstrap the Bowline environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
+require File.expand_path(File.join(File.dirname(__FILE__), 'boot'))
 
 Bowline::Initializer.run do |config|
   config.name       = <%= full_name.inspect %>

data/templates/script/build

@@ -1,3 +1,3 @@
 <%= shebang %>
-require File.join(File.dirname(__FILE__), *%w[.. config boot])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. config boot]))
 require "bowline/commands/build"

data/templates/script/console

@@ -1,3 +1,3 @@
 <%= shebang %>
-require File.join(File.dirname(__FILE__), *%w[.. config boot])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. config boot]))
 require "bowline/commands/console"

data/templates/script/generate

@@ -1,3 +1,3 @@
 <%= shebang %>
-require File.join(File.dirname(__FILE__), *%w[.. config boot])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. config boot]))
 require "bowline/commands/generate"

data/templates/script/init

@@ -1,3 +1,3 @@
 <%= shebang %>
-require File.join(File.dirname(__FILE__), *%w[.. config boot])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. config boot]))
 require "bowline/commands/init"

data/templates/script/run

@@ -1,3 +1,3 @@
 <%= shebang %>
-require File.join(File.dirname(__FILE__), *%w[.. config boot])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. config boot]))
 require "bowline/commands/run"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -04:00
+date: 2010-09-24 00:00:00 +01:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: templater
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -42,14 +44,15 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta
-        version: 3.0.0.beta
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyzip2
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -64,6 +67,7 @@ dependencies:
   name: supermodel
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -78,6 +82,7 @@ dependencies:
   name: bowline-bundler
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -206,6 +211,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -213,6 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -222,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Bowline GUI framework