bowline 0.5.8 → 0.6.0

data/lib/bowline/version.rb

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

data/lib/bowline/watcher.rb

@@ -19,39 +19,66 @@ module Bowline
     # MyClass.on_update { puts 'update' }
     # MyClass.new.on_create { puts 'create' }
     module Base
-      # Create a helper method to easily add new callbacks.
-      # Example:
-      #   watch :on_load
-      #   on_load { puts "Loaded!" }
-      def watch(*names)
-      	names.each do |name|
-          # Because define_method only takes a block,
-          # which doesn't accept multiple arguments
-          script = <<-RUBY
-            def #{name}(*args, &block)
-              watcher.append(:#{name}, *args, &block)
-            end
-          RUBY
-          instance_eval script
-          class_eval    script
-  			end
+      def self.extended(base)
+      	base.send :extend, ClassMethods
+      end
+      
+      def self.included(base)
+        base.send :extend, InstanceMethods
       end
       
       def watcher
         @watcher ||= Watcher.new
       end
+      
+      module ClassMethods
+        # Create a helper method to easily add new callbacks.
+        # Example:
+        #   watch :on_load
+        #   on_load { puts "Loaded!" }
+        def watch(*names)
+        	names.each do |name|
+            # Because define_method only takes a block,
+            # which doesn't accept multiple arguments
+            script = <<-RUBY
+              def #{name}(*args, &block)
+                watcher.append(:#{name}, *args, &block)
+              end
+            RUBY
+            instance_eval script
+    			end
+        end
+      end
+      
+      module InstanceMethods #:nodoc:
+        def watch(*names)
+        	names.each do |name|
+            script = <<-RUBY
+              def #{name}(*args, &block)
+                watcher.append(:#{name}, *args, &block)
+              end
+            RUBY
+            class_eval script
+    			end
+        end
+      end
     end
   
     class Callback
-      attr_reader :event, :prok
-    
-      def initialize(watcher, event, prok)
-      	@watcher, @event, @prok = watcher, event, prok
+
+      attr_reader :event, :prok, :oneshot
+
+      def initialize(watcher, event, prok, oneshot = false)
+        @watcher = watcher
+        @event   = event
+        @prok    = prok
+        @oneshot = oneshot
       end
       
       # Execute callback
       def call(*args)
-      	@prok.call(*args)
+      	prok.call(*args)
+      	remove if oneshot
       end
       
       # Remove callback from watcher
@@ -65,8 +92,8 @@ module Bowline
     end
     
     # Add new method/proc to a specific event.
-    def append(event, method = nil, &block)
-      callback = Callback.new(self, event, method||block)
+    def append(event, method = nil, oneshot = false, &block)
+      callback = Callback.new(self, event, method||block, oneshot)
       (@listeners[event] ||= []) << callback
       callback
     end

data/templates/Gemfile

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

data/templates/config/boot.rb

@@ -1,12 +1,15 @@
-# Don't change this file!
-# Configure your app in config/environment.rb
-
 APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined?(APP_ROOT)
-local_path = File.join(APP_ROOT, *%w{vendor bowline lib bowline.rb})
 
-if File.exist?(local_path)
-  require local_path
+# Use Bundler (preferred)
+environment = File.expand_path("../../vendor/gems/environment", __FILE__)
+if File.exist?("#{environment}.rb")
+  require environment
+
+# Use RubyGems
 else
   require "rubygems"
-  require "bowline"
-end
+  require "bundler"
+  Bundler.setup
+end
+
+require "bowline"

data/templates/main_window.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bowline
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +00:00
+date: 2010-02-10 00:00:00 +00:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 3.0.0.beta
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip2
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Ruby/JS GUI framework
 email: alex@leadthinking.com
 executables: 
@@ -63,6 +73,7 @@ files:
 - assets/bowline.js
 - assets/bowline.menu.js
 - assets/bowline.state.js
+- assets/bowline.test.js
 - assets/bowline.view.js
 - assets/jquery.chain.js
 - assets/jquery.dataset.js
@@ -79,19 +90,15 @@ files:
 - examples/twitter.html
 - examples/users.rb
 - lib/bowline.rb
+- lib/bowline/app_config.rb
 - lib/bowline/binders.rb
+- lib/bowline/binders/collection.rb
+- lib/bowline/binders/observer.rb
+- lib/bowline/binders/singleton.rb
 - lib/bowline/commands/build.rb
 - lib/bowline/commands/console.rb
 - lib/bowline/commands/generate.rb
 - lib/bowline/commands/run.rb
-- lib/bowline/dependencies/FAQ.markdown
-- lib/bowline/dependencies/MIT-LICENSE
-- lib/bowline/dependencies/README.markdown
-- lib/bowline/dependencies/TODO.markdown
-- lib/bowline/dependencies/lib/dependencies.rb
-- lib/bowline/dependencies/lib/dependencies/dependency.rb
-- lib/bowline/dependencies/lib/dependencies/repository.rb
-- lib/bowline/dependencies/lib/ext/rubygems.rb
 - lib/bowline/desktop.rb
 - lib/bowline/desktop/app.rb
 - lib/bowline/desktop/bridge.rb
@@ -103,14 +110,13 @@ files:
 - lib/bowline/desktop/misc.rb
 - lib/bowline/desktop/network.rb
 - lib/bowline/desktop/proxy.rb
+- lib/bowline/desktop/runtime.rb
 - lib/bowline/desktop/sound.rb
 - lib/bowline/desktop/window.rb
 - lib/bowline/desktop/window_manager.rb
 - lib/bowline/desktop/window_methods.rb
 - lib/bowline/ext/array.rb
-- lib/bowline/ext/class.rb
 - lib/bowline/ext/object.rb
-- lib/bowline/ext/string.rb
 - lib/bowline/generators.rb
 - lib/bowline/generators/application.rb
 - lib/bowline/generators/binder.rb
@@ -121,18 +127,17 @@ files:
 - lib/bowline/helpers.rb
 - lib/bowline/initializer.rb
 - lib/bowline/library.rb
-- lib/bowline/local_model.rb
 - lib/bowline/logging.rb
 - lib/bowline/platform.rb
 - lib/bowline/tasks/app.rake
 - lib/bowline/tasks/bowline.rb
 - lib/bowline/tasks/database.rake
-- lib/bowline/tasks/gems.rake
 - lib/bowline/tasks/libs.rake
 - lib/bowline/tasks/log.rake
 - lib/bowline/tasks/misc.rake
 - lib/bowline/version.rb
 - lib/bowline/watcher.rb
+- templates/Gemfile
 - templates/Rakefile
 - templates/binder.rb
 - templates/config/application.yml

data/lib/bowline/dependencies/FAQ.markdown

@@ -1,6 +0,0 @@
-FAQ
-===
-
-1. gem install or uninstall fails with gem >= 0 message
-  > gems/gems/ directory is likely dirty, remove any specifications, cache, doc, gems, or bin folders beneath it.
-

data/lib/bowline/dependencies/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/bowline/dependencies/README.markdown

@@ -1,51 +0,0 @@
-Dependencies
-============
-
-A port of Merb's dependency system to a Rails plugin.
-
-Usage
-=====
-
-1. Install the plugin
-
-        script/plugin install git://github.com/ddollar/dependencies.git
-
-2. Add the following line to your config/environment.rb
-
-        config.plugins = [:dependencies, :all]
-
-3. Add the following line to your .gitignore
-
-        gems
-
-4. Create a config/dependencies.rb file that looks like:
-
-        dependency 'gem'
-        dependency 'gem', '1.0.1'
-        dependency 'gem', :require_as => 'Gem'
-        dependency 'gem', :only => %w(test staging)
-        dependency 'gem', :except => 'production'
-
-        with_options(:only => 'test') do |test|
-          test.dependency 'tester-gem'
-        end
-
-5. Remove or comment out any config.gem lines from config/environment.rb or config/environments/*.rb
-
-6. Install the gems into your project and keep them up to date using:
-
-        rake dependencies:sync
-
-7. Alternatively you can use the following rake task to read your existing config.gem declarations and output a file suitable for this plugin. This task will appropriately handle any gems that you are currently loading on a per-environment basis as well.
-
-        rake dependencies:import
-
-
-About
-=====
-
-Initial idea and Rubygems extension code from [Merb](http://merbivore.com/)
-
-Rewritten for Rails by [David Dollar](http://daviddollar.org) ([@ddollar](http://twitter.com/ddollar))
-
-Documentation, testing, ideas by Steven Soroka ([@ssoroka](http://twitter.com/ssoroka))

data/lib/bowline/dependencies/TODO.markdown

@@ -1,4 +0,0 @@
-To Do
-=====
-
-* Better handling of gems that depend on Rails to load.

data/lib/bowline/dependencies/lib/dependencies.rb

@@ -1,6 +0,0 @@
-module Dependencies #:nodoc: all
-end
-
-Dir[File.join(File.dirname(__FILE__), 'dependencies', '*.rb')].each do |file|
-  require file
-end

data/lib/bowline/dependencies/lib/dependencies/dependency.rb

@@ -1,12 +0,0 @@
-class Dependencies::Dependency
-  attr_accessor :name, :versions, :options
-  
-  def initialize(name, *options)
-    opts = options.last.is_a?(Hash) ? options.pop : {}
-    vers = options
-
-    @name     = name
-    @versions = vers
-    @options  = opts
-  end
-end

data/lib/bowline/dependencies/lib/dependencies/repository.rb

@@ -1,64 +0,0 @@
-class Dependencies::Repository
-
-  def initialize(base)
-    @paths = {
-      :gems  => File.join(base),
-      :bin   => File.join(base, 'bin'),
-      :specs => File.join(base, 'specifications')
-    }
-  end
-
-  def index
-    @index ||= reload_index!
-  end
-
-  def reload_index!
-    @index = ::Gem::SourceIndex.new.load_gems_in(@paths[:specs])
-  end
-
-  def gem(name, versions=[])
-    ::Gem::Dependency.new(name, versions)
-  end
-
-  def search(gem)
-    index.search(gem)
-  end
-
-  def install(gem)
-    reload_index!
-    return if index.search(gem).last
-    
-    installer = ::Gem::DependencyInstaller.new(
-      :bin_dir => @paths[:bin],
-      :install_dir => @paths[:gems],
-      :user_install => false)
-
-    begin
-      installer.install gem.name, gem.version_requirements
-    rescue ::Gem::GemNotFoundException => e
-      puts "Cannot find #{gem.name} #{gem.version_requirements}"
-    rescue ::Gem::RemoteFetcher::FetchError => e
-      puts "Problem with fetch, retrying..."
-      retry
-    end
-  end
-
-  def uninstall(name, version)
-    uninstaller = ::Gem::Uninstaller.new(name,
-      :version => version,
-      :bin_dir => @paths[:bin],
-      :install_dir => @paths[:gems],
-      :ignore => true,
-      :executables => true
-    )
-    uninstaller.uninstall
-  end
-  
-  def installed
-    Dir[File.join(@paths[:gems], 'gems', '*')].map! { |n| File.basename(n) }
-  end
-
-  def gems
-  end
-
-end

data/lib/bowline/dependencies/lib/ext/rubygems.rb

@@ -1,116 +0,0 @@
-require 'erb'
-require 'rubygems'
-require 'rubygems/uninstaller'
-require 'rubygems/dependency_installer'
-
-# We only require this in 'rake gems:sync' since
-# it contains some advanced Gem features that aren't
-# available in earlier versions, such as pre_install_hooks
-
-Gem.pre_install_hooks.push(proc do |installer|
-  name = installer.spec.name
-
-  puts "+ #{name}"
-
-  if $GEMS && versions = ($GEMS.assoc(name) || [])[1]
-    dep = Gem::Dependency.new(name, versions)
-    unless dep.version_requirements.satisfied_by?(installer.spec.version)
-      raise "Cannot install #{installer.spec.full_name} " \
-            "for #{$INSTALLING}; " \
-            "you required #{dep}"
-    end
-  end
-end)
-
-class ::Gem::Uninstaller #:nodoc:
-  def self._with_silent_ui
-
-    ui = Gem::DefaultUserInteraction.ui
-    def ui.say(str)
-      puts "- #{str}"
-    end
-
-    yield
-
-    class << Gem::DefaultUserInteraction.ui
-      remove_method :say
-    end
-  end
-
-  def self._uninstall(source_index, name, op, version)
-    unless source_index.find_name(name, "#{op} #{version}").empty?
-      uninstaller = Gem::Uninstaller.new(
-        name,
-        :version => "#{op} #{version}",
-        :install_dir => File.join(Dir.pwd, "vendor", "gems"),
-        :all => true,
-        :ignore => true,
-        :executables => true
-      )
-      _with_silent_ui { uninstaller.uninstall }
-    end
-  end
-
-  def self._uninstall_others(source_index, name, version)
-    _uninstall(source_index, name, "<", version)
-    _uninstall(source_index, name, ">", version)
-  end
-end
-
-Gem.post_install_hooks.push(proc do |installer|
-  source_index = installer.instance_variable_get("@source_index")
-  ::Gem::Uninstaller._uninstall_others(
-    source_index, installer.spec.name, installer.spec.version
-  )
-end)
-
-class ::Gem::DependencyInstaller #:nodoc:
-  alias old_fg find_gems_with_sources
-
-  def find_gems_with_sources(dep)
-    if @source_index.any? { |_, installed_spec|
-      installed_spec.satisfies_requirement?(dep)
-    }
-      return []
-    end
-
-    old_fg(dep)
-  end
-end
-
-class ::Gem::SpecFetcher #:nodoc:
-  alias old_fetch fetch
-  def fetch(*args) # in rubygems 1.3.2 fetch takes 4 parameters
-    dependency, all, matching_platform, prerelease = *args
-    idx = Gem::SourceIndex.from_installed_gems
-
-    reqs = dependency.version_requirements.requirements
-
-    if reqs.size == 1 && reqs[0][0] == "="
-      dep = idx.search(dependency).sort.last
-    end
-
-    if dep
-      file = dep.loaded_from.dup
-      file.gsub!(/specifications/, "cache")
-      file.gsub!(/gemspec$/, "gem")
-      spec = ::Gem::Format.from_file_by_path(file).spec
-      [[spec, file]]
-    else
-      old_fetch(*args)
-    end
-  end
-end
-
-class ::Gem::Specification #:nodoc:
-  def recursive_dependencies(from, index = Gem.source_index)
-    specs = self.runtime_dependencies.map do |dep|
-      spec = index.search(dep).last
-      unless spec
-        raise "Needed #{dep} for #{from}, but could not find it"
-      end
-      spec
-    end
-    specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq
-  end
-end