bowline 0.6.1 → 0.6.2

data/README.txt

@@ -45,10 +45,13 @@ http://groups.google.com/group/bowline-dev
 
 = REQUIREMENTS
 
-- Mac OSX (both Leopard & Snow Leopard)
-- Ruby 1.9 (Ruby 1.8.6 is supported, but we recommend you use 1.9 since that's the version your application will be using when it's run).
+- Mac OSX >=10.5 or Ubuntu
+- Ruby 1.9
 - Bowline gem
 
+If you're on Ubuntu, you'll need to run:
+  apt-get install libwebkit-dev
+
 The other required libraries, such as bowline-desktop, are downloaded later by Bowline - you don't need to worry about these.
 
 = INSTALLATION

data/Rakefile

@@ -11,6 +11,17 @@ begin
     gemspec.add_dependency('activesupport', '>= 3.0.0.beta')
     gemspec.add_dependency('rubyzip2',      '>= 2.0.1')
     gemspec.add_dependency('supermodel')
+    
+    gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
+    #{'*'*50}
+
+      Thank you for installing Bowline.
+      
+      If you're on Linux, please install the WebKit library:
+        sudo apt-get install libwebkit-dev
+
+    #{'*'*50}
+    POST_INSTALL_MESSAGE
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/TODO

@@ -11,7 +11,6 @@ Add --version to bowline-gen
 
 Developer tools:
   F5 to reload page
-  Show inspector
   Reload ruby
 
 Tutorials:
@@ -21,9 +20,7 @@ Tutorials:
   CSS search box & placeholder
   
 - Don't run initializers during rake tasks
-- Find out why build is taking so long
 - Add first-run initializers
-- Add reload keyboard shortcut
 - Add some sort of production mode
 - Generate correct shebang on script files
 - Use App.root rather than APP_ROOT

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/bowline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-25}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
      "lib/bowline/desktop/js.rb",
      "lib/bowline/desktop/misc.rb",
      "lib/bowline/desktop/network.rb",
+     "lib/bowline/desktop/path.rb",
      "lib/bowline/desktop/proxy.rb",
      "lib/bowline/desktop/runtime.rb",
      "lib/bowline/desktop/sound.rb",
@@ -119,9 +120,18 @@ Gem::Specification.new do |s|
      "vendor/progressbar.rb"
   ]
   s.homepage = %q{http://github.com/maccman/bowline}
+  s.post_install_message = %q{    **************************************************
+
+      Thank you for installing Bowline.
+      
+      If you're on Linux, please install the WebKit library:
+        sudo apt-get install libwebkit-dev
+
+    **************************************************
+}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Bowline GUI framework}
   s.test_files = [
     "examples/tweet.rb",

data/lib/bowline.rb

@@ -23,8 +23,8 @@ module Bowline
   end
 end
 
-$LOAD_PATH << File.dirname(__FILE__)
-$LOAD_PATH << File.join(Bowline.lib_path, "vendor")
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH << File.join(Bowline.lib_path, 'vendor')
 
 require 'bowline/version'
 
@@ -61,4 +61,4 @@ require 'bowline/initializer'
 require 'bowline/binders'
 require 'bowline/binders/observer'
 require 'bowline/binders/collection'
-require 'bowline/binders/singleton'
+require 'bowline/binders/singleton'

data/lib/bowline/commands/console.rb

@@ -1,22 +1,17 @@
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+require "optparse"
+require "irb"
+require "irb/completion"
 
-require 'optparse'
-
-options = { :irb => irb }
+options = {}
 OptionParser.new do |opt|
   opt.banner = "Usage: console [environment] [options]"
-  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |v| options[:irb] = v }
-  opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
+  opt.on("--debugger", "Enable ruby-debugging for the console.") { |v| options[:debugger] = v }
   opt.parse!(ARGV)
 end
 
-libs =  " -r irb/completion"
-libs << %( -r "#{APP_ROOT}/config/environment")
-
 if options[:debugger]
   begin
-    require 'ruby-debug'
-    libs << " -r ruby-debug"
+    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'"
@@ -24,4 +19,5 @@ if options[:debugger]
   end
 end
 
-exec "#{options[:irb]} #{libs} --simple-prompt"
+require "#{APP_ROOT}/config/environment"
+IRB.start

data/lib/bowline/desktop/network.rb

@@ -1,7 +1,67 @@
+require "socket"
+require "timeout"
+
 module Bowline
   module Desktop
-    class Network #:nodoc:
-      # Implement address polling to see if we're online
+    module Network
+      extend Bowline::Watcher::Base
+      watch :on_online, :on_offline, :on_change
+      
+      def online!
+        return if @online
+        @online = true
+        watcher.call(:on_online)
+        watcher.call(:on_change)
+      end
+      
+      def offline!
+        return unless @online
+        @online = false
+        watcher.call(:on_offline)
+        watcher.call(:on_change)
+      end
+      
+      def online?
+        @online
+      end
+      
+      def host
+        @host ||= "google.com"
+      end
+      
+      def host=(host)
+        @host = host
+      end
+      
+      def port
+        @port ||= 80
+      end
+      
+      def port=(port)
+        @port = port
+      end
+      
+      def poll!
+        Thread.new do
+          loop do
+            ping ? online! : offline!
+            sleep 30
+          end
+        end
+      end
+            
+      private
+            
+        def ping
+          Timeout::timeout(3) {
+            TCPSocket.new(host, port).close
+          }
+          true
+        rescue Errno::ECONNREFUSED, Timeout::Error, StandardError
+          false
+        end
+      
+      extend self
     end
   end
 end

data/lib/bowline/desktop/path.rb

@@ -0,0 +1,30 @@
+module Bowline
+  module Desktop
+    module Path
+      ##
+      # :singleton-method: documents
+      # Get the users documents dir.
+      # * Unix: ~ (the home directory)
+      # * Windows: "C:\Documents and Settings\username\My Documents"
+      # * Mac: ~/Documents
+      
+      ##
+      # :singleton-method: data
+      # Get the app's data dir.
+      # * Unix: prefix/share/appinfo
+      # * Windows: the directory where the executable file is located
+      # * 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".
+      
+      ##
+      # :singleton-method: temp
+      # Get the tempory directory
+    end
+  end
+end

data/lib/bowline/desktop/window_methods.rb

@@ -35,13 +35,13 @@ module Bowline
         self._url = address.to_s
       end
       
-      def select_dir(options = {})
+      def select_file(options = {})
         flags = 0
         flags |= Window::FD_OPEN if options[:open]
         flags |= Window::FD_SAVE if options[:save]
         flags |= Window::FD_OVERWRITE_PROMPT if options[:overwrite_prompt]
         flags |= Window::FD_FILE_MUST_EXIST  if options[:file_must_exist]
-        _select_dir(
+        _select_file(
           options[:message],
           options[:default_path],
           options[:default_filename],

data/lib/bowline/ext/object.rb

@@ -3,7 +3,9 @@ class Object
   #  * A hash or
   #  * An array of hashes
   def to_js
-    if respond_to?(:attributes)
+    if respond_to?(:attribute_hash)
+      attribute_hash
+    elsif respond_to?(:attributes)
       attributes
     else
       self

data/lib/bowline/generators.rb

@@ -1,5 +1,6 @@
-gem 'templater', '>= 0.3.2'
-require 'templater'
+gem "templater", ">= 0.3.2"
+require "templater"
+require "rbconfig"
 
 module Bowline
   module Generators #:nodoc: all
@@ -22,6 +23,10 @@ module Bowline
         end
       end
       
+      def shebang
+        "#!/usr/bin/env #{RbConfig::CONFIG["RUBY_INSTALL_NAME"]}"
+      end
+      
       def self.source_root
         File.join(File.dirname(__FILE__), *%w[.. .. templates])
       end

data/lib/bowline/generators/application.rb

@@ -39,7 +39,7 @@ module Bowline::Generators
     glob! "public/javascripts"
     glob! "public/stylesheets"
     
-    glob! "script"
+    glob! "script", [nil]
     
     file :jquery,    "../assets/jquery.js",        "public/javascripts/jquery.js"
     file :chainjs,   "../assets/jquery.chain.js",  "public/javascripts/jquery.chain.js"

data/lib/bowline/initializer.rb

@@ -1,4 +1,5 @@
-require 'pathname'
+require "pathname"
+require "fileutils"
 
 module Bowline
   class << self
@@ -263,7 +264,7 @@ module Bowline
     def initialize_windows
       return unless Bowline::Desktop.enabled?
       MainWindow.setup
-      MainWindow.name = configuration.name
+      MainWindow.title = configuration.name
     end
     
     def initialize_trap
@@ -275,6 +276,7 @@ module Bowline
     
     def initialize_marshal
       return unless defined?(SuperModel)
+      FileUtils.mkdir_p(File.dirname(configuration.marshal_path))
       SuperModel::Marshal.path = configuration.marshal_path
       SuperModel::Marshal.load
       at_exit {

data/lib/bowline/version.rb

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

data/templates/Gemfile

@@ -1,10 +1,10 @@
 # Edit this Gemfile to bundle your application's dependencies.
 
-gem "rubygems-update"
-gem "bundler", "=0.8.1"
+gem "rubygems-update", "= 1.3.5"
+gem "bundler08"
 gem "bowline"
 
 ## Bundle the gems you use:
 # gem "bj"
 # gem "hpricot", "0.6"
-# gem "sqlite3-ruby", :require_as => "sqlite3"
+# gem "sqlite3-ruby", :require_as => "sqlite3"

data/templates/script/build

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

data/templates/script/console

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

data/templates/script/generate

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

data/templates/script/init

@@ -1,2 +1,2 @@
-#!/usr/bin/env ruby
+<%= shebang %>
 require File.join(*%w[config environment])

data/templates/script/run

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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bowline
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -9,49 +14,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +00:00
+date: 2010-02-25 00:00:00 +00:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: templater
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
         version: 3.0.0.beta
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyzip2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 1
         version: 2.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: supermodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: Ruby/JS GUI framework
 email: alex@leadthinking.com
 executables: 
@@ -109,6 +129,7 @@ files:
 - lib/bowline/desktop/js.rb
 - lib/bowline/desktop/misc.rb
 - lib/bowline/desktop/network.rb
+- lib/bowline/desktop/path.rb
 - lib/bowline/desktop/proxy.rb
 - lib/bowline/desktop/runtime.rb
 - lib/bowline/desktop/sound.rb
@@ -164,7 +185,7 @@ has_rdoc: true
 homepage: http://github.com/maccman/bowline
 licenses: []
 
-post_install_message: 
+post_install_message: "    **************************************************\n\n      Thank you for installing Bowline.\n      \n      If you're on Linux, please install the WebKit library:\n        sudo apt-get install libwebkit-dev\n\n    **************************************************\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -173,18 +194,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Bowline GUI framework