waves 0.7.2 → 0.7.3

data/app/Rakefile

@@ -1,4 +1,22 @@
-require 'waves'
-Waves::Console.load
-%w( schema cluster generate ).each { |task| require "lib/tasks/#{task}.rb" }
+#!/usr/bin/env ruby
+if File.exist?(waves_src = File.join(File.dirname(__FILE__), 'waves'))
+  $:.unshift(File.join(waves_src, 'lib'))
+end
 
+begin
+  require 'waves'
+  Waves::Console.load
+  %w( schema cluster generate ).each { |task| require "lib/tasks/#{task}.rb" }
+rescue LoadError
+  puts "Can't find waves gem or ./waves/lib directory.  try rake symlink waves=/path/to/waves/"
+end
+
+desc "Create lib and bin symlinks using waves=<path>"
+task :symlink do
+  waves = ENV['waves']
+  system "mkdir waves"
+  libdir = File.join(waves, 'lib')
+  bindir = File.join(waves, 'bin')
+  system(cmd = "ln -s #{libdir} waves/") && puts(cmd)
+  system(cmd = "ln -s #{bindir} waves/") && puts(cmd)
+end

data/app/bin/waves-console

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+if File.exist?(waves_src = File.join(File.dirname(__FILE__), '..', 'waves'))
+  $:.unshift(File.join(waves_src, 'lib'))
+end
+
+load File.join(waves_src, 'bin', 'waves-console')

data/app/bin/waves-server

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+if File.exist?(waves_src = File.join(File.dirname(__FILE__), '..', 'waves'))
+  $:.unshift(File.join(waves_src, 'lib'))
+end
+
+load File.join(waves_src, 'bin', 'waves-server')

data/app/controllers/default.rb.erb

@@ -16,8 +16,8 @@ module <%= name %>
 		
 			def update( name )
 			  instance = find( name )
-			  instance.set( attributes )
-			  instance.save_changes
+			  instance.update_with_params( attributes )
+			  instance
 			end
 		
 			def delete( name ); find( name ).destroy; end

data/app/lib/application.rb.erb

@@ -41,7 +41,7 @@ module <%= name %>
 	# accessor methods for modules and other key application objects ...
 	class << self
 		def config ; Waves::Server.config rescue nil || Waves::Console.config ; end
-		def database ; @database ||= Sequel.mysql( config.database ) ; end
+		def database ; @database ||= Sequel.open( config.database ) ; end
 		def configurations ; <%= name %>::Configurations ; end
 		def controllers ; <%= name %>::Controllers ; end
 		def models ; <%= name %>::Models ; end

data/app/lib/startup.rb.erb

@@ -1,2 +1,3 @@
 require 'lib/<%= name.downcase %>'
-Waves << <%= name %>
+Waves << <%= name %>
+Application = <%= name %>

data/app/lib/tasks/schema.rb

@@ -5,7 +5,7 @@ namespace :schema do
   task :migration do |task|
 	
 		version = ( ENV['version'].nil? ? 
-			Sequel::Migrator.get_current_migration_version( Blog.database ) :
+			Sequel::Migrator.get_current_migration_version( Application.database ) :
 			ENV['version'].to_i  ) + 1
 
 		name = ENV['name'] || 'migration'

data/bin/waves

@@ -6,19 +6,22 @@ unless ARGV.length == 1
 end
 
 require 'rubygems'
-require 'waves'
+require 'erubis'
+require 'extensions/all'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'utilities', 'string')
 
 puts "** Creating new Waves application ..."
-app_name = ARGV[0]
+app_path = ARGV[0]
+app_name = File.basename(app_path)
 template = File.join( File.dirname(__FILE__),'..','app')
-system "cp -R #{template} #{app_name}"
+system "cp -R #{template} #{app_path}"
 
 # get rid of placeholder files left over from gem install
-Dir["#{app_name}/**/EMPTY"].each { |path| system "rm #{path}" }
+Dir["#{app_path}/**/EMPTY"].each { |path| system "rm #{path}" }
 
 # next, process all template files ...
-Dir["#{app_name}/**/*.erb"].each do |path|
-  unless path =~ %r{^#{app_name}/(schema/migrations/templates|templates)}
+Dir["#{app_path}/**/*.erb"].each do |path|
+  unless path =~ %r{^#{app_path}/(schema/migrations/templates|templates)}
     name = app_name.camel_case
     File.write( path.gsub(/\.erb$/,''), 
       Erubis::Eruby.new( File.read( path ) ).result( binding ) )
@@ -26,7 +29,10 @@ Dir["#{app_name}/**/*.erb"].each do |path|
   end
 end
 
+# make the scripts executable
+system "chmod ug+x #{app_path}/bin/waves-*"
+
 # finally, change the lib/application.rb file
-system "mv #{app_name}/lib/application.rb #{app_name}/lib/#{app_name}.rb"
+system "mv #{app_path}/lib/application.rb #{app_path}/lib/#{app_name}.rb"
 
 puts "** Application created!"

data/bin/waves-console

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'waves'
 require 'choice'
 

data/lib/waves.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 # the underlying web server
 require 'mongrel'
 require 'rack'
+require 'daemons'
 require 'live_console'
 require 'autocode'
 

metadata

@@ -1,33 +1,135 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: waves
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
-date: 2008-02-05 00:00:00 -08:00
-summary: Open-source framework for building Ruby-based Web applications.
-require_paths: 
-- lib
-email: dan@zeraweb.com
-homepage: http://dev.zeraweb.com/waves
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.6
-  version: 
+  version: 0.7.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Dan Yoder
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-06-09 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: markaby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: extensions
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: live_console
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: choice
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: autocode
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
+    version: 
+description: 
+email: dan@zeraweb.com
+executables: 
+- waves
+- waves-server
+- waves-console
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - lib/controllers/mixin.rb
 - lib/dispatchers/base.rb
@@ -61,6 +163,9 @@ files:
 - lib/utilities/symbol.rb
 - lib/views/mixin.rb
 - lib/waves.rb
+- app/bin
+- app/bin/waves-console
+- app/bin/waves-server
 - app/configurations
 - app/configurations/default.rb.erb
 - app/configurations/development.rb.erb
@@ -79,7 +184,6 @@ files:
 - app/lib/tasks/cluster.rb
 - app/lib/tasks/generate.rb
 - app/lib/tasks/schema.rb
-- app/log
 - app/models
 - app/models/default.rb.erb
 - app/public
@@ -107,117 +211,31 @@ files:
 - app/tmp/sessions/EMPTY
 - app/views
 - app/views/default.rb.erb
-test_files: []
-
+has_rdoc: true
+homepage: http://dev.zeraweb.com/waves
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- waves
-- waves-server
-- waves-console
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.6
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mongrel
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: markaby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: erubis
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: autocode
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extensions
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: live_console
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: choice
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Open-source framework for building Ruby-based Web applications.
+test_files: []
+