bowline 0.6.2 → 0.6.3

data/README.txt

@@ -12,7 +12,7 @@ Ruby, HTML and JS desktop application framework.
 * Uses Webkit
 * View in HTML/JavaScript
 * Binding between HTML & Ruby
-* Cross platform (only osx atm ;)
+* Cross platform (OSX & Ubuntu) - Windows soon
 
 = INTRODUCTION
 
@@ -114,12 +114,7 @@ Suffice to say, the HTML looks a bit like this:
       <a href="#" class="destroy">Delete</a>
     </div>
   </div>
-
-Now, were you to have a user object, you could do something like
-this to update the HTML.
-
-# TODO
-
+  
 = METHODS IN BINDERS
 
 You can call both class and instance methods of the binders.
@@ -189,7 +184,6 @@ Usage for a collection (of users):
         def admins
           # This just replaces all the listed
           # users with just admins
-          # TODO
           self.items = User.admins.all
         end
       end

data/TODO

@@ -1,5 +1,3 @@
-Use new Rails gem packaging system
-
 Ideas: 
   * bowline-notification gem (Growl)
 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/bowline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-04-06}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
      "lib/bowline/commands/build.rb",
      "lib/bowline/commands/console.rb",
      "lib/bowline/commands/generate.rb",
+     "lib/bowline/commands/init.rb",
      "lib/bowline/commands/run.rb",
      "lib/bowline/desktop.rb",
      "lib/bowline/desktop/app.rb",
@@ -102,6 +103,8 @@ Gem::Specification.new do |s|
      "templates/config/boot.rb",
      "templates/config/database.yml",
      "templates/config/environment.rb",
+     "templates/config/environments/development.rb",
+     "templates/config/environments/production.rb",
      "templates/gitignore",
      "templates/helper.rb",
      "templates/main_window.rb",

data/lib/bowline.rb

@@ -7,24 +7,19 @@ require 'active_support/core_ext/hash/indifferent_access'
 Thread.abort_on_exception = true
 
 module Bowline
-  def lib_path
+  def library_path
     File.expand_path(
-      File.join(File.dirname(__FILE__), *%w[..])
+      File.join(File.dirname(__FILE__), "..")
     )
   end
-  module_function :lib_path
-  
-  def assets_path
-    File.join(lib_path, "assets")
-  end
-  module_function :assets_path
+  module_function :library_path  
   
   module Base
   end
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH << File.join(Bowline.lib_path, 'vendor')
+$LOAD_PATH << File.join(Bowline.library_path, 'vendor')
 
 require 'bowline/version'
 
@@ -46,9 +41,11 @@ require 'bowline/desktop/dock'
 require 'bowline/desktop/host'
 require 'bowline/desktop/misc'
 require 'bowline/desktop/network'
+require 'bowline/desktop/path'
 require 'bowline/desktop/sound'
 require 'bowline/desktop/window_methods'
 require 'bowline/desktop/window'
+require 'bowline/desktop/runtime'
 require 'bowline/desktop/js'
 require 'bowline/desktop/proxy'
 require 'bowline/desktop/bridge'

data/lib/bowline/app_config.rb

@@ -1,41 +1,28 @@
+require 'supermodel'
+
 module Bowline
-  class AppConfig
-    attr_reader :keys, :path
-    def initialize(path)
-      @path = path
-      @keys = {}
-      load!
-    end
-    
-    def load!
-      return unless File.exist?(path)
-      @keys = YAML::load(File.read(path))
-    end
-    
-    def dump!
-      File.open(path, "w+") {|f| f.write(YAML::dump(keys)) }
-    end
-    
-    def delete(key)
-      @keys.delete(key)
-      dump!
-    end
+  class AppConfig < SuperModel::Base
+    include SuperModel::Marshal::Model
     
-    def method_missing(sym, *args)
-      method_name = sym.to_s
+    class << self
+      def instance
+        @instance ||= create
+      end
+      
+      def marshal_records(record = nil)
+        self.instance.load(record.attributes) if record
+        self.instance
+      end
       
-      if method_name =~ /(=|\?)$/
-        case $1
-        when "="
-          keys[$`] = args.first
-          dump!
-        when "?"
-          keys[$`]
-        end
-      else
-        return keys[method_name] if keys.include?(method_name)
-        super
+      def load!(path)
+        self.instance.load_path(path)
+        self.instance
       end
     end
+    
+    def load_path(path)
+      return unless path && File.exist?(path)
+      load(YAML::load(File.read(path)))
+    end
   end
 end

data/lib/bowline/binders.rb

@@ -60,7 +60,60 @@ module Bowline
       extend Bowline::Desktop::Bridge::ClassMethods
       js_expose
       
-      class << self
+      module Async
+        protected
+        def async(*methods)
+          if block_given?
+            Thread.new(callback_proc) do |proc|
+              begin
+              self.callback_proc = proc
+              yield
+            rescue => e
+              Bowline::Logging.log_error(e)
+            end
+            end
+          else
+            methods.each do |method|
+              class_eval(<<-EOS, __FILE__, __LINE__)
+                def #{method}_with_async(*args, &block)
+                  async { #{method}_without_async(*args, &block) }
+                end
+              EOS
+              alias_method_chain method, :async
+            end
+          end
+        end
+      end
+      
+      extend  Async
+      include Async
+      class << self; extend Async; end
+      
+      class << self        
+        def callback_proc(proc = nil) #:nodoc:
+          Thread.current[:callback] = proc if proc
+          Thread.current[:callback]
+        end
+        alias_method :callback_proc=, :callback_proc
+        
+        def callback(result = nil)
+          result = yield if block_given?
+          callback_proc.call(result)
+        end
+        
+        def js_invoke(window, callback, method, *args) #:nodoc:
+          self.callback_proc = callback
+          if method == :setup
+            setup(window)
+          else
+            send(method, *args)
+          end
+        end
+                
+        def instance_invoke(id, method, *args) #:nodoc:
+          self.new(id).send(method, *args)
+        end
+        
         # An array of window currently bound.
         def windows
           @windows ||= []
@@ -68,10 +121,11 @@ module Bowline
         
         def setup(window) #:nodoc:
           self.windows << window
+          self.windows.uniq!
           if initial_items = initial
             self.items = initial_items
           end
-          Hash.new # Empty options
+          callback(true)
         end
         
         # Called by a window's JavaScript whenever that window is bound to this Binder.
@@ -84,18 +138,6 @@ module Bowline
         def initial
         end
         
-        def js_invoke(window, method, *args) #:nodoc:
-          if method == :setup
-            setup(window)
-          else
-            send(method, *args)
-          end
-        end
-                
-        def instance_invoke(id, meth, *args) #:nodoc:
-          self.new(id).send(meth, *args)
-        end
-        
         # Calls .find on the klass sent to the bind method.
         # This is used internally, to find records when the page
         # invoke instance methods.
@@ -133,8 +175,8 @@ module Bowline
         # Remove an item from the binder, updating the HTML.
         # This method is normally only called internally by 
         # the bound class's after_destroy callback.
-        def removed(item)
-          bowline.removed(
+        def destroyed(item)
+          bowline.destroyed(
             name, 
             item.id
           ).call
@@ -174,62 +216,26 @@ module Bowline
         # See Bowline::logger
         def logger
           Bowline::logger
-        end
-      
-        # Trigger events on all elements
-        # bound to this binder.
-        # Example:
-        #   trigger(:reload, {:key => :value})
-        def trigger(event, data = nil)
-          bowline.trigger(
-            name,
-            format_event(event), 
-            data
-          ).call
-        end
-      
-        # Helper method to trigger a loading 
-        # event either side of a block:
-        #  loading {
-        #   # Slow code, e.g. http call
-        #  }
-        def loading(&block)
-          trigger(:loading, true)
-          yield
-          trigger(:loading, false)
-        end
-    
-        def format_event(name) #:nodoc:
-          name.is_a?(Array) ? 
-            name.join('.') : 
-              name.to_s
-        end
+        end        
       end
-      
-      # jQuery element object
-      attr_reader :element
-      
+            
       # Instance of the bound class' record
       attr_reader :item
 
       def initialize(id, *args) #:nodoc:
-        @element = self.class.bowline.element(
-                      self.class.name, id
-                   )
-        @item    = self.class.find(id)
+        @item = self.class.find(id)
       end
       
       protected
-        # Trigger jQuery events on this element.
-        # Example:
-        #   trigger(:highlight)
-        def trigger(event, data = nil)
-          element.trigger(
-            self.class.format_event(event), 
-            data
-          ).call
+        def callback_proc(*args) #:nodoc
+          self.class.callback_proc(*args)
         end
-        
+        alias_method :callback_proc=, :callback_proc
+      
+        def callback(*args, &block)
+          self.class.callback(*args, &block)
+        end
+      
         # Remove element from the view
         def remove!
           self.class.removed(item)

data/lib/bowline/binders/observer.rb

@@ -15,7 +15,7 @@ module Bowline
       end
       
       def after_destroy(rec)
-        binder.removed(rec)
+        binder.destroyed(rec)
       end
       
       def update(observed_method, object) #:nodoc:

data/lib/bowline/binders/singleton.rb

@@ -2,11 +2,6 @@ module Bowline
   module Binders
     class Singleton < Base
       class << self
-        def setup(*args) #:nodoc
-          super(*args)
-          {:singleton => true}
-        end
-        
         alias :item= :items=
         
         # Associate the binder with a model to setup callbacks so 

data/lib/bowline/commands/console.rb

@@ -1,23 +1,2 @@
-require "optparse"
-require "irb"
-require "irb/completion"
-
-options = {}
-OptionParser.new do |opt|
-  opt.banner = "Usage: console [environment] [options]"
-  opt.on("--debugger", "Enable ruby-debugging for the console.") { |v| options[:debugger] = v }
-  opt.parse!(ARGV)
-end
-
-if options[:debugger]
-  begin
-    require "ruby-debug"
-    puts "=> Debugger enabled"
-  rescue Exception
-    puts "You need to install ruby-debug to run the console in debugging mode. With gems, use 'gem install ruby-debug'"
-    exit
-  end
-end
-
-require "#{APP_ROOT}/config/environment"
-IRB.start
+ENV["APP_IRB"] = "1"
+require "bowline/commands/run"

data/lib/bowline/commands/generate.rb

@@ -1,3 +1,3 @@
-require 'bowline/generators'
+require "bowline/generators"
 
-Bowline::Generators.run_cli(APP_ROOT, 'bowline', Bowline::Version::STRING, ARGV)
+Bowline::Generators.run_cli(APP_ROOT, "bowline", Bowline::Version::STRING, ARGV)

data/lib/bowline/commands/init.rb

@@ -0,0 +1,12 @@
+unless Bowline::Desktop.enabled?
+  raise "Script not executed by bowline-desktop"
+end
+
+require Bowline.root.join(*%w{config environment})
+
+if ENV["APP_IRB"]
+  require "irb"
+  require "irb/completion"
+  IRB.start
+  Bowline::Desktop::App.exit
+end

data/lib/bowline/commands/run.rb

@@ -4,4 +4,4 @@ unless Bowline::Library.ready?
   Rake::Task['libs:setup'].invoke
 end
 
-exec("#{Bowline::Library.desktop_path} #{APP_ROOT}")
+exec("#{Bowline::Library.desktop_path} #{Bowline.root}")

data/lib/bowline/desktop.rb

@@ -30,6 +30,6 @@ module Bowline
     rescue => e
       log_error e
     end
-    module_function :tick
+    module_function :tick    
   end
 end

data/lib/bowline/desktop/bridge.rb

@@ -30,8 +30,8 @@ module Bowline
               true
             end
             
-            def js_invoke(window, method, *args)
-              send(method, *args)
+            def js_invoke(window, callback, method, *args)
+              callback.call(send(method, *args))
             end
           RUBY
         end
@@ -40,20 +40,31 @@ module Bowline
       class Message #:nodoc:
         include Bowline::Logging
         
-        attr_reader :window, :id, :klass, :method, :args
+        attr_reader :window, :id, :klass, :method_name, :args
         
         def initialize(window, atts)
-          @window   = window
-          atts      = atts.with_indifferent_access
-          @id       = atts[:id]
-          @klass    = atts[:klass]
-          @method   = atts[:method].to_sym
-          @args     = atts[:args] || []
+          @window       = window
+          atts          = atts.with_indifferent_access
+          @id           = atts[:id]
+          @klass        = atts[:klass]
+          @method_name  = atts[:method].to_sym
+          @args         = atts[:args] || []
         end
         
         def callback?
           @id != -1
         end
+        
+        def callback(result)
+          return unless callback?
+          proxy = Proxy.new(window)
+          proxy = proxy.Bowline.invokeCallback(
+            id, result.to_js.to_json
+          )
+          Runtime.main { 
+            window.run_script(proxy.to_s)
+          }
+        end
 
         def invoke
           if klass == "_window"
@@ -62,14 +73,19 @@ module Bowline
             # TODO - security concerns with constantize
             object = klass.constantize
           end
-          trace "JS invoking: #{klass}.#{method}(#{args.join(',')})"
-          if object.respond_to?(:js_exposed?) && object.js_exposed?(method)
-            result = object.js_invoke(window, method, *args)
-            if callback?
-              proxy = Proxy.new(window)
-              proxy.Bowline.invokeCallback(id, result.to_js.to_json)
-              window.run_script(proxy.to_s)
-            end
+
+          trace "JS invoking: #{klass}.#{method_name}(#{args.join(',')})"
+
+          if object.respond_to?(:js_exposed?) && 
+              object.js_exposed?(method_name)
+            
+            object.js_invoke(
+              window, 
+              method(:callback), 
+              method_name, 
+              *args
+            )
+
           else
             raise "Method not allowed"
           end
@@ -82,7 +98,8 @@ module Bowline
         result = JSON.parse(str)
         Message.new(window, result).invoke
       rescue => e
-        Bowline::Logging.log_error e
+        Bowline::Logging.trace(str)
+        Bowline::Logging.log_error(e)
       end
       module_function :call
     end

data/lib/bowline/desktop/js.rb

@@ -55,20 +55,15 @@ module Bowline
             raise e
           end
       end
-
-      def poll
-        run_scripts
-      end
-      module_function :poll
       
-      def setup
+      def setup! #:nodoc:
         Desktop.on_idle(method(:poll))
       end
-      module_function :setup
+      module_function :setup!
     
-      def eval(win, str, method = nil, &block)
-        script = Script.new(win, str, method||block)
-        if Thread.current == Thread.main && script.ready?
+      def eval(window, string, method = nil, &block)
+        script = Script.new(window, string, method||block)
+        if Runtime.main_thread? && script.ready?
           script.call
         else
           scripts << script
@@ -77,18 +72,17 @@ module Bowline
       module_function :eval
     
       private
-        def run_scripts
+        def poll
           ready_scripts = scripts.select(&:ready?)
           ready_scripts.each do |script|
             script.call
             scripts.delete(script)
           end
         end
-        module_function :run_scripts
+        module_function :poll
         
-        # TODO - thread safety, needs mutex
         def scripts
-          Thread.main[:scripts] ||= []
+          @scripts ||= []
         end
         module_function :scripts
     end

data/lib/bowline/desktop/network.rb

@@ -15,7 +15,7 @@ module Bowline
       end
       
       def offline!
-        return unless @online
+        return if @online == false
         @online = false
         watcher.call(:on_offline)
         watcher.call(:on_change)

data/lib/bowline/desktop/path.rb

@@ -8,6 +8,12 @@ module Bowline
       # * Windows: "C:\Documents and Settings\username\My Documents"
       # * Mac: ~/Documents
       
+      # Get the users home dir
+      def home
+        Gem.user_home
+      end
+      module_function :home
+      
       ##
       # :singleton-method: data
       # Get the app's data dir.
@@ -16,11 +22,22 @@ module Bowline
       # * Mac: appinfo.app/Contents/SharedSupport bundle subdirectory
       
       ##
-      # :singleton-method: user_data
       # Get the app's user data dir.
       # * Unix: ~/.appinfo
       # * Windows: "C:\Documents and Settings\username\Application Data\appinfo"
       # * Mac: "~/Library/Application Support/appinfo".
+      def user_data
+        conf = Bowline.configuration
+        case Bowline::Platform.type
+        when :linux
+          File.join(home, "." + conf.name)
+        when :win32
+          File.join(home, "Application Data", conf.name)
+        when :osx
+          File.join(home, "Library", "Application Support", conf.name)
+        end
+      end
+      module_function :user_data
       
       ##
       # :singleton-method: temp

data/lib/bowline/desktop/runtime.rb

@@ -1,17 +1,30 @@
+require "thread"
+
 module Bowline
   module Desktop
     module Runtime
-      def setup
+      def setup! #:nodoc:
         Desktop.on_tick(method(:poll))
       end
-      module_function :setup
+      module_function :setup!
       
-      def run_in_main_thread(method = nil, &block)
-        procs << method||block
+      # Run block/method in main thread
+      def main(method = nil, &block)
+        proc = method||block
+        if main_thread?
+          proc.call
+        else
+          procs << proc
+        end
+      end
+      module_function :main
+      
+      def main_thread?
+        Thread.current == Thread.main
       end
-      module_function :run_in_main_thread
+      module_function :main_thread?
       
-      private      
+      private
         def poll
           while proc = procs.shift
             proc.call
@@ -19,9 +32,8 @@ module Bowline
         end
         module_function :poll
       
-        # TODO - thread safety, needs mutex
         def procs
-          Thread.main[:procs] ||= []
+          @procs ||= []
         end
         module_function :procs 
     end

data/lib/bowline/desktop/window_manager.rb

@@ -4,7 +4,7 @@ module Bowline
     # It's the usual way of interfacing with your application's windows, 
     # and all of Bowline's windows normally inherit from it.
     # 
-    # You'll need to call the setup method, before calling using this class.
+    # You'll need to call the setup! method, before calling using this class.
     # If the window is deallocated (i.e. closed), you'll need to call it again.
     # It's worth not calling the setup method before you need it, since it'll
     # increase the amount of CPU your application uses.
@@ -55,7 +55,7 @@ module Bowline
         # Call this method to allocate a new window.
         # You'll need to do this before using it, 
         # or after it has been closed.
-        def setup
+        def setup!
           return unless Desktop.enabled?
           return if @window && !@window.dealocated?
           if self.name == "MainWindow"
@@ -68,7 +68,7 @@ module Bowline
           @script_callback = Proc.new {|str|
             Bowline::Desktop::Bridge.call(self, str)
           }
-          @window.script_callback = @script_callback;
+          @window.script_callback = @script_callback
         end
         
         # Evaluate JavaScript in this window. Pass

data/lib/bowline/ext/array.rb

@@ -1,5 +1,5 @@
 class Array
-  def to_js
-    map {|i| i.to_js }
+  def to_js(*args)
+    map {|i| i.to_js(*args) }
   end
 end

data/lib/bowline/ext/object.rb

@@ -2,9 +2,9 @@ class Object
   # Aim is to convert the object into:
   #  * A hash or
   #  * An array of hashes
-  def to_js
-    if respond_to?(:attribute_hash)
-      attribute_hash
+  def to_js(*args)
+    if respond_to?(:serializable_hash)
+      serializable_hash(*args)
     elsif respond_to?(:attributes)
       attributes
     else

data/lib/bowline/generators.rb

@@ -2,6 +2,43 @@ gem "templater", ">= 0.3.2"
 require "templater"
 require "rbconfig"
 
+module Templater
+  module Actions
+    class Touch < Action
+
+      def initialize(generator, name, destination, options={})
+        self.generator = generator
+        self.name = name
+        self.destination = destination
+        self.options = options
+      end
+
+      def render
+        ''
+      end
+
+      def exists?
+        ::File.exists?(destination)
+      end
+  
+      def identical?
+        exists?
+      end
+  
+      def invoke!
+        callback(:before)
+        ::FileUtils.touch(destination)
+        callback(:after)
+      end
+    
+      def revoke!
+        ::FileUtils.rm_rf(::File.expand_path(destination))
+      end
+
+    end # Touch
+  end # Actions
+end # Templater
+
 module Bowline
   module Generators #:nodoc: all
     extend Templater::Manifold
@@ -27,6 +64,12 @@ module Bowline
         "#!/usr/bin/env #{RbConfig::CONFIG["RUBY_INSTALL_NAME"]}"
       end
       
+      def self.touch(name, destination)
+        empty_directories << Templater::ActionDescription.new(name) do |generator|
+          Templater::Actions::Touch.new(generator, name, destination)
+        end
+      end
+      
       def self.source_root
         File.join(File.dirname(__FILE__), *%w[.. .. templates])
       end

data/lib/bowline/generators/application.rb

@@ -5,11 +5,11 @@ module Bowline::Generators
     DESC
     
     def app_id
-      ['bowline', name].join('.')
+      ["bowline", name].join(".")
     end
     
     def destination_root
-      # Todo - only works relative
+      # TODO - only works relative
       File.join(@destination_root, base_name)
     end
     
@@ -19,7 +19,6 @@ module Bowline::Generators
     
     first_argument :name, :required => true, :desc => "application name"
 
-    empty_directory :tmp,     "tmp"    
     empty_directory :vendor,  "vendor"
     empty_directory :lib,     "lib"
     empty_directory :db,      "db"
@@ -60,7 +59,12 @@ module Bowline::Generators
       file(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action)
     }
     
+    glob! "config/environments"
+    
     empty_directory :initializers, "config/initializers"
+    empty_directory :first_run,    "config/first_run"
+    
+    touch "app_first_run"
     
     file :readme, "../README.txt", "README"
   end

data/lib/bowline/initializer.rb

@@ -34,6 +34,22 @@ module Bowline
     def root
       Pathname.new(APP_ROOT) if defined?(APP_ROOT)
     end
+    
+    def public_path
+      root && root.join("public")
+    end
+    
+    def assets_path
+      File.join(library_path, "assets")
+    end
+    
+    def env
+      @env ||= ActiveSupport::StringInquirer.new(ENV["APP_ENV"] || "development")
+    end
+    
+    def irb?
+      !!ENV["APP_IRB"]
+    end
   end
   
   class Initializer #:nodoc:
@@ -61,7 +77,14 @@ module Bowline
       @configuration = configuration
       @loaded_plugins = []
     end
-        
+    
+    def set_environment
+      production_path = Bowline.root.join("app_production")
+      ENV["APP_ENV"] ||= begin
+        production_path.exist? ? "production" : "development"
+      end
+    end
+    
     def require_frameworks
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
@@ -158,7 +181,7 @@ module Bowline
     # Loads support for "whiny nil" (noisy warnings when methods are invoked
     # on +nil+ values) if Configuration#whiny_nils is true.
     def initialize_whiny_nils
-      require('active_support/whiny_nil') if configuration.whiny_nils
+      require("active_support/whiny_nil") if configuration.whiny_nils
     end
     
     # Sets the default value for Time.zone, and turns on ActiveRecord::Base#time_zone_aware_attributes.
@@ -197,18 +220,32 @@ module Bowline
     end
         
     def load_plugins
-      Dir.glob(File.join(configuration.plugin_glob, 'init.rb')).sort.each do |path|
+      Dir.glob(File.join(configuration.plugin_glob, "init.rb")).sort.each do |path|
         config = configuration # Need local config variable
         eval(IO.read(path), binding, path)
       end
     end
     
+    def load_application_environment
+      require(Bowline.root.join(*%w{config environments}, Bowline.env))
+    end
+    
     def load_application_initializers
       Dir.glob(configuration.initializer_glob).sort.each do |initializer|
         load(initializer)
       end
     end
     
+    def load_application_first_run
+      first_run = Bowline.root.join("app_first_run")
+      if first_run.exist?
+        first_run.unlink
+        Dir.glob(configuration.first_run_glob).sort.each do |initializer|
+          load(initializer)
+        end
+      end
+    end
+    
     def after_initialize
       configuration.after_initialize_blocks.each do |block|
         block.call
@@ -253,31 +290,39 @@ module Bowline
     # Creates a class called AppConfig from configuration
     # variables found in config/application.yml
     def load_app_config
-      Object.const_set("AppConfig", AppConfig.new(configuration.app_config_file))
+      Object.const_set("AppConfig", AppConfig.load!(configuration.app_config_file))
     end
     
-    def initialize_js
-      return unless Bowline::Desktop.enabled?
-      Bowline::Desktop::JS.setup
+    def initialize_desktop
+      return unless Desktop.enabled?
+      Desktop::Runtime.setup!
+      Desktop::JS.setup!
     end
     
     def initialize_windows
-      return unless Bowline::Desktop.enabled?
-      MainWindow.setup
+      return unless Desktop.enabled?
+      MainWindow.setup!
       MainWindow.title = configuration.name
     end
     
     def initialize_trap
-      return unless Bowline::Desktop.enabled?
+      return unless Desktop.enabled?
       trap("INT") {
-        Bowline::Desktop::App.exit
+        Desktop::App.exit
       }
     end
     
+    def initialize_path
+      # Dir::tmpdir/Tempfile uses this
+      ENV["TMPDIR"] = Desktop::Path.temp if Desktop.enabled?
+      FileUtils.mkdir_p(Desktop::Path.user_data)
+    end
+    
     def initialize_marshal
       return unless defined?(SuperModel)
-      FileUtils.mkdir_p(File.dirname(configuration.marshal_path))
-      SuperModel::Marshal.path = configuration.marshal_path
+      path = configuration.marshal_path
+      path = path.call if path.is_a?(Proc)
+      SuperModel::Marshal.path = path
       SuperModel::Marshal.load
       at_exit {
         SuperModel::Marshal.dump
@@ -287,6 +332,8 @@ module Bowline
     def process
       Bowline.configuration = configuration
       
+      set_environment
+      
       set_load_path
       load_gems
       
@@ -314,16 +361,18 @@ module Bowline
       load_plugins
       load_application_classes
       load_application_helpers
-            
-      load_application_initializers
       
-      after_initialize
-            
-      initialize_js
+      initialize_desktop
       initialize_windows
       initialize_trap
-      
+      initialize_path
       initialize_marshal
+            
+      load_application_environment
+      load_application_initializers
+      load_application_first_run
+      
+      after_initialize
       
       Bowline.initialized = true
     end
@@ -419,9 +468,8 @@ module Bowline
      attr_accessor :time_zone
      
      attr_accessor :plugin_glob
-     
      attr_accessor :helper_glob
-     
+     attr_accessor :first_run_glob
      attr_accessor :initializer_glob
           
      # Set the application's name.
@@ -473,6 +521,7 @@ module Bowline
        self.plugin_glob                  = default_plugin_glob
        self.helper_glob                  = default_helper_glob
        self.initializer_glob             = default_initalizer_glob
+       self.first_run_glob               = default_first_run_glob
        self.publisher                    = default_publisher
        self.copyright                    = default_copyright
        
@@ -589,7 +638,7 @@ module Bowline
      end
      
      def default_marshal_path
-       File.join(root_path, 'db', 'marshal.db')
+       Proc.new { File.join(Desktop::Path.user_data, 'marshal.db') }
      end
 
      def default_cache_classes
@@ -611,6 +660,10 @@ module Bowline
      def default_initalizer_glob
        File.join(root_path, *%w{ config initializers **/*.rb })
      end
+     
+     def default_first_run_glob
+       File.join(root_path, *%w{ config first_run **/*.rb })
+     end
           
      def default_publisher
        "Bowline"

data/lib/bowline/library.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module Bowline
   # Provides paths to Bowline's required libraries.
   module Library
@@ -8,50 +10,32 @@ module Bowline
     # Path to a folder stored under the users
     # home directory containing the downloaded libraries.
     def path
-      File.expand_path(
-        File.join(home_path, ".bowline")
+      Pathname.new(
+        File.expand_path(
+          File.join(Gem.user_home, ".bowline")
+        )
       )
     end
-    module_function :path
     
     # Path to the bowline-desktop binary
     def desktop_path
-      File.join(path, "bowline-desktop")
+      path.join("bowline-desktop")
     end
-    module_function :desktop_path
     
     def libs_path
-      File.join(path, "libs")
+      path.join("libs")
     end
-    module_function :libs_path
     
     def local_build_path
-      File.join(APP_ROOT, "build")
+      Bowline.root.join("build")
     end
-    module_function :local_build_path
     
     # Returns true if all required libraries exist.
     def ready?
       File.exist?(desktop_path) && 
         File.directory?(libs_path)
     end
-    module_function :ready?
-    
-    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
+
+    extend self
   end
 end

data/lib/bowline/tasks/app.rake

@@ -1,9 +1,43 @@
 require 'fileutils'
 require 'erb'
 require 'rbconfig'
+require 'tempfile'
+require 'zip/zip'
 
 namespace :app do  
-  namespace :build do    
+  namespace :build do
+    task :zip => :environment do
+      unless Bowline::Library.ready?
+        Rake::Task["libs:setup"].invoke
+      end
+      
+      config = Bowline.configuration
+      
+      build_path  = Bowline::Library.local_build_path
+      FileUtils.mkdir_p(build_path)
+      
+      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)
+      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/ }
+      
+      Zip::ZipFile.open(app_path, Zip::ZipFile::CREATE) do |zf|
+        # This is horrible - but RubyZIP's API sucks
+        blank = Tempfile.new("blank")
+        zf.add("app_first_run", blank.path)
+        zf.add("app_production", blank.path)
+        
+        dirs.each do |dir|
+          name = dir.sub(Bowline.root.to_s + "/", "")
+          zf.add(name, dir)
+        end
+      end
+    end
+    
     task :osx => :environment do
       unless Bowline::Library.ready?
         Rake::Task["libs:setup"].invoke
@@ -11,7 +45,7 @@ namespace :app do
       
       config = Bowline.configuration
       assets_path = File.join(Bowline.assets_path, "osx")
-      build_path  = Bowline::Library.local_build_path
+      build_path  = Bowline::Library.local_build_path.to_s
       app_path    = File.join(build_path, "#{config.name}.app")
       FileUtils.rm_rf(app_path)
       contents_path = File.join(app_path, "Contents")
@@ -32,7 +66,7 @@ namespace :app do
           # Make icon
           makeicns = File.join(assets_path, "makeicns")
           if config.icon
-            makeicns_in = File.expand_path(config.icon, APP_ROOT)
+            makeicns_in = File.expand_path(config.icon, Bowline.root)
           else
             makeicns_in = File.join(assets_path, "bowline.png")
           end
@@ -41,13 +75,15 @@ namespace :app do
           `#{makeicns} -in #{makeicns_in} -out #{makeicns_out}`
         
           # Copy App
-          dirs = Dir[File.join(APP_ROOT, '**')]
+          dirs = Dir[File.join(APP_ROOT, "**")]
           dirs.delete(build_path)
-          dirs.delete(File.join(APP_ROOT, 'log'))
-          dirs.delete(File.join(APP_ROOT, 'tmp'))
-          dirs.delete(File.join(APP_ROOT, 'db', 'migrate'))
-          dirs.delete_if {|i| i =~ /\.svn|\.DS_Store/ }
-          FileUtils.cp_r(dirs, '.')
+          dirs.delete(File.join(APP_ROOT, "log"))
+          dirs.delete(File.join(APP_ROOT, *%w{db migrate}))
+          dirs.delete_if {|i| i =~ /\.svn|\.DS_Store|\.git/ }
+          FileUtils.cp_r(dirs, ".")
+          
+          FileUtils.touch("app_production")
+          FileUtils.touch("app_first_run")
         end
         
         # Copy Bowline binary & libs

data/lib/bowline/tasks/libs.rake

@@ -34,14 +34,6 @@ def unzip(fpath, tpath)
   }
 end
 
-def sym_or_copy(from, to)
-  begin
-    FileUtils.ln_s(from, to)
-  rescue NotImplementedError
-    FileUtils.cp_r(from, to)
-  end
-end
-
 namespace :libs do  
   desc "Download Bowline's binary and pre-compiled libs"
   task :download => :environment do

data/lib/bowline/version.rb

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

data/templates/config/environment.rb

@@ -7,8 +7,4 @@ Bowline::Initializer.run do |config|
   config.version    = "0.0.1"
   config.publisher  = "Example"
   config.url        = "http://example.com"
-    
-  # config.gem "activerecord"
-  # config.gem "net-mdns", :lib => 'net/dns/mdns'
-  # config.gem "rubyzip", :lib => 'zip/zip'
 end

data/templates/main_window.rb

@@ -1,5 +1,5 @@
 class MainWindow < Bowline::Desktop::WindowManager
-  setup
+  setup!
   self.file   = :index
   self.width  = 300
   self.height = 400

data/templates/script/init

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

data/templates/window.rb

@@ -1,3 +1,3 @@
 class <%= class_name %> < Bowline::Desktop::WindowManager
-  setup
+  setup!
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +00:00
+date: 2010-04-06 00:00:00 +01:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - lib/bowline/commands/build.rb
 - lib/bowline/commands/console.rb
 - lib/bowline/commands/generate.rb
+- lib/bowline/commands/init.rb
 - lib/bowline/commands/run.rb
 - lib/bowline/desktop.rb
 - lib/bowline/desktop/app.rb
@@ -165,6 +166,8 @@ files:
 - templates/config/boot.rb
 - templates/config/database.yml
 - templates/config/environment.rb
+- templates/config/environments/development.rb
+- templates/config/environments/production.rb
 - templates/gitignore
 - templates/helper.rb
 - templates/main_window.rb