equipment 1.4.84 → 1.4.94

data/CHANGES

@@ -1,5 +1,17 @@
 = Equipment Changelog
 
+== Version 1.4.94
+
+This release introduces the new camping_command. It used the Camping controller
+structure to add command-line actions to your app. All controllers that have a
+"cmd" method are dispatched to the command-line. 
+
+* bin/camping_command : NEW console-camping apps laucher
+* lib/ext/command.rb : NEW command thing introduced.
+* lib/camping_boot.rb : NEW camping boot method.
+* lib/ext/flash.rb : Fixes the logic of flash access.
+* lib/ext/settings.rb : Conf files are now looked-up with .conf extension instead of .yaml
+
 == Version 1.4.84
 
 Unstable release

data/Rakefile

@@ -23,22 +23,32 @@ require 'rake/gempackagetask'
 # Later DamageControl can bump PATCH automatically.
 #
 # REMEMBER TO KEEP PKG_VERSION IN SYNC WITH THE CHANGES FILE!
-PKG_TITLE = "Equipment"
+PKG_TITLE = "Equipment (for Camping)"
 PKG_NAME = "equipment"
-PKG_VERSION = "1.4.84"
+PKG_DESC = <<-EOF
+    Equipment is a set of extensions you can use with your Camping apps.
+  EOF
+PKG_VERSION = "1.4.94"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
+  'bin/**/*',
   'doc/**/*',
   'example/**/*',
   'lib/**/*.rb',
   'share/**/*'
 ]
 
-task :default => [:gem]
+CLOBBER.include('test/test.log')
 
-Rake::TestTask.new(:test) do |t|
+task :default => [:test]
 
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList[
+    'test/test_*.rb'
+  ]
+#  t.warning = true
+#  t.verbose = true
 end
 
 # Create a task to build the RDOC documentation tree.
@@ -64,12 +74,12 @@ spec = Gem::Specification.new do |s|
 
   s.name = PKG_NAME
   s.version = PKG_VERSION
-  s.summary = "Equipments (for Camping)."
-  s.description = <<-EOF
-    Equipment is a set of extensions you can use with your Camping apps.
-  EOF
+  s.summary = PKG_TITLE
+  s.description = PKG_DESC
 
   s.files = PKG_FILES.to_a
+  s.executables = ['camping_command']
+  s.bindir = 'bin'
   s.require_path = 'lib'
 #  s.autorequire = 'meta_project'
 
@@ -88,6 +98,10 @@ spec = Gem::Specification.new do |s|
   s.email = "zimba.tm@gmail.com"
   s.homepage = "http://#{PKG_NAME}.rubyforge.org"
   s.rubyforge_project = PKG_NAME
+
+  ### Dependencies
+
+  s.add_dependency("camping", "= 1.4.157")
 end
 
 desc "Build Gem"
@@ -130,7 +144,7 @@ task :publish_files => [:package] do
     release.user_name = ENV['RUBYFORGE_USER']
     release.password = ENV['RUBYFORGE_PASSWORD']
     release.files = release_files.to_a
-    release.release_name = "#{PKG_TITLE} v#{PKG_VERSION}"
+    release.release_name = PKG_VERSION
     # The rest of the options are defaults (among others, release_notes and release_changes, parsed from CHANGES)
   end
 end

data/bin/camping_command

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require 'camping'
+require 'camping_boot'
+
+usage = <<HELP
+Usage : #{File.basename($0)} <camping_app.rb> <command> [args]
+HELP
+
+app = ARGV.shift
+unless app
+  puts "ERROR : No Camping app specified"
+  puts usage
+  exit -1
+end
+
+apps = Camping.boot(app)
+
+app = apps.first.klass
+unless app
+  puts "ERROR : No Camping app found"; exit -1
+end
+unless app.respond_to? :command
+  puts "ERROR : #{app} does not support console commands"; exit -1
+end
+
+app.command ARGV
+

data/lib/camping_boot.rb

@@ -0,0 +1,52 @@
+require 'camping'
+require 'camping/reloader'
+require 'ostruct'
+
+module Camping
+  def self.boot(conf, *apps)
+    unless conf.kind_of? OpenStruct
+      apps.unshift conf
+      conf = OpenStruct.new
+    end
+
+    # Setup paths
+    if home = ENV['HOME'] # POSIX
+      conf.db = File.join(home, '.camping.db')
+      conf.rc = File.join(home, '.campingrc')
+    elsif home = ENV['APPDATA'] # MSWIN
+      conf.db = File.join(home, 'Camping.db')
+      conf.rc = File.join(home, 'Campingrc')
+    end
+
+    # Load configuration
+    if conf.rc and File.exists?( conf.rc )
+      YAML.load_file(conf.rc).each do |k,v|
+        conf.send("#{k}=", v)
+      end
+    end
+
+    # Setup database
+    unless conf.database
+      unless conf.db
+        puts "!! No home directory found.  Please specify a database file, see --help."; exit
+      end
+      conf.database = {:adapter => 'sqlite3', :database => conf.db}
+    end
+
+    # Load apps
+    apps = apps.inject([]) do |apps, script|
+      if File.directory? script
+        apps.push(*Dir[File.join(script, '*.rb')])
+      else
+        apps << script
+      end
+    end
+
+    Camping::Reloader.database = conf.database
+    Camping::Reloader.log = conf.log
+    apps.map! { |script| Camping::Reloader.new(script) }
+    return apps
+  end
+
+end
+

data/lib/camping_ext.rb

@@ -1,6 +1,6 @@
 # Basic camping extension
 
-require 'camping'
+#require 'camping'
 require 'stringio' # used in Camping but not required
 
 # remove some things in Camping
@@ -54,15 +54,8 @@ module CampExt
     super
   end
 
-  # Same as for #create.
-  #
-  # This method is intended to be used by launchers that support dynamically
-  # installing and removing applications.
-  # 
-  def install; false end
-
-  # See #install.
-  def uninstall; false end
+  # Not used
+  def destroy; false end
 
   # Equips global equipments. Make sure they are included before loading your apps.
   def self.extended(app)

data/lib/equipment.rb

@@ -5,12 +5,8 @@
 require 'metaid'
 require 'ruby_ext'
 require 'ext'
-
-if using? :Camping
-  require 'camping_ext'
-elsif not Object.autoload? :Camping
-  autoload :Camping, 'camping_ext'
-end
+require 'camping'
+require 'camping_ext'
 
 # This module provides the facilities for equipments. If included in an app,
 # it will provide a basic set of extensions. If extended in an equipment, it
@@ -19,6 +15,8 @@ module Equipment
   LIB_PATH = File.expand_path(File.dirname(__FILE__))
   DATA_PATH = File.join(LIB_PATH, '..', 'share')
 
+  attr_accessor :debug
+
   # Utility for equipments. Automatically sets a set of rule for importing
   # methods, classes, class methods in your application for your extension.
   #
@@ -56,14 +54,14 @@ module Equipment
     # dependencies
     dependencies.each { |ext| ext.equip(app) }
 
-    puts "** equipped #{self} in #{app}" if $DBG
+    puts "** equipped #{self} in #{app}" if debug
 
     app_mods = app.constants.sort.select do |name|
       app.const_get(name).kind_of?(Module)
     end
 
-    puts "App Mods  : #{app_mods.inspect}" if $DBG
-    puts "Ext Mods  : #{constants.inspect}" if $DBG
+    puts "App Mods  : #{app_mods.inspect}" if debug
+    puts "Ext Mods  : #{constants.inspect}" if debug
 
     app_mods.each do |name|
       app_mod = app.const_get(name)
@@ -74,16 +72,16 @@ module Equipment
            mod.private_instance_methods.size > 0
           app_mod.insert(mod)
 #          app_mod.include(mod)
-          puts "Inserted  : #{mod} -> #{app_mod}" if $DBG
+          puts "Inserted  : #{mod} -> #{app_mod}" if debug
         elsif mod.constants.size > 0
           mod.transfer_classes_to(app_mod, :force)
-          puts "Cls trans : #{mod} -> #{app_mod}" if $DBG
+          puts "Cls trans : #{mod} -> #{app_mod}" if debug
         end
       end
       if const_defined?("#{name}ClassMethods")
         mod_ext = const_get("#{name}ClassMethods")
         app_mod.extend(mod_ext)
-        puts "Extended  : #{mod_ext} -> #{app_mod}" if $DBG
+        puts "Extended  : #{mod_ext} -> #{app_mod}" if debug
       end
     end
   end

data/lib/ext/command.rb

@@ -0,0 +1,50 @@
+require 'equipment'
+require 'pp'
+
+module Ext
+  module Command
+    extend Equipment
+
+    module CClassMethods
+      def command(*args)
+        self::X.M
+        args.flatten!
+        cmds=self::X.r.select{|k|k.instance_methods.include?'cmd'}
+        cmd=args.shift
+
+        # Default actions
+        unless cmd
+          cmd='default' if cmds.find{|k| /^default$/i =~ k.name.demodulize}
+          cmd='list' unless cmd
+        end
+
+        case cmd
+        when /^list$/i
+          cmds.each do |k|
+            puts k.name.demodulize.methodize
+            puts k.help if k.respond_to? :help
+          end
+          exit
+        else
+          k=cmds.find{|k| %r{^#{cmd.gsub('_','')}$}i =~ k.name.demodulize}
+          if not k
+            puts "ERROR : No command named '#{cmd}'"; exit -1
+          end
+
+          out = send(:cmd, k.name.demodulize, *args).body
+
+          case out
+          when String
+            puts out
+          else
+            pp out
+          end
+        end
+      rescue => ex
+        puts "ERROR : #{ex.message}"
+        puts ex.backtrace.join("\n") if $DBG
+      end
+    end
+  end
+end
+

data/lib/ext/flash.rb

@@ -59,17 +59,16 @@ module Ext
     # Only store Strings.
     class Flasher
       def initialize(cookies_in, cookies_out)
-        @in, @out = cookies_in, cookies_out
+        @in, @out, @tmp = cookies_in.dup, cookies_out
+        @in.each do |k,v|
+          @in[k] = nil if v.empty?
+        end
       end
 
       def [](key)
         key = convert_key(key)
-        if @in[key] and not @in[key].empty?
-          @out[key] = '' if @out.has_key? key
-          return @in[key]
-        else
-          return nil
-        end
+        @out[key] = '' if @out.has_key? key
+        return @in[key]
       end
 
       def []=(key, value)

data/lib/ext/settings.rb

@@ -21,7 +21,7 @@ module Ext
   #
   #    setting :database, {:store=>'mysql', :hostname=>'localhost'}
   #
-  #    load_settings('your_config.yaml')
+  #    load_settings('your_config.conf')
   #  end
   #
   #  YourApp.database #=> {:store=>'mysql', :hostname=>'localhost'}
@@ -89,9 +89,9 @@ module Ext
  
           # YAML config
           configs = []
-          configs << File.join(ENV['HOME'], ".#{name}.yaml") if ENV['HOME']
-          configs << File.join(ENV['APPDATA'], "#{name}.yaml") if ENV['APPDATA']
-          configs << "/etc/#{name}.yaml"
+          configs << File.join(ENV['HOME'], ".#{name}.conf") if ENV['HOME']
+          configs << File.join(ENV['APPDATA'], "#{name}.conf") if ENV['APPDATA']
+          configs << "/etc/#{name}.conf"
           configs.each do |conf|
             conf = File.expand_path(conf)
             if File.exists?(conf)
@@ -104,7 +104,7 @@ module Ext
           # Ruby config
           configs = []
           configs << File.join(ENV['HOME'], ".#{name}.rb") if ENV['HOME']
-          configs << File.join(ENV['APPDATA'], "#{name}.yaml") if ENV['APPDATA']
+          configs << File.join(ENV['APPDATA'], "#{name}.rb") if ENV['APPDATA']
           configs << "/etc/#{name}.rb"
           configs.each do |conf|
             conf = File.expand_path(conf)
@@ -123,6 +123,9 @@ module Ext
       # 'YourApp.keyname'
       def save_settings(yaml_file=settings_path)
         raise ArgumentError, "No settings path given" unless yaml_file
+        if File.directory?(yaml_file)
+          yaml_file = File.join(yaml_file, self.name.methodize+'.conf')
+        end
         settings.save(yaml_file)
       end
     end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: equipment
 version: !ruby/object:Gem::Version 
-  version: 1.4.84
-date: 2006-09-12 00:00:00 +02:00
-summary: Equipments (for Camping).
+  version: 1.4.94
+date: 2006-10-02 00:00:00 +02:00
+summary: Equipment (for Camping)
 require_paths: 
 - lib
 email: zimba.tm@gmail.com
@@ -33,6 +33,7 @@ files:
 - README
 - LICENSE
 - CHANGES
+- bin/camping_command
 - doc/structure.png
 - doc/structure.dia
 - lib/camping_ext.rb
@@ -40,6 +41,7 @@ files:
 - lib/ruby_ext.rb
 - lib/equipment.rb
 - lib/mimetype_ext.rb
+- lib/camping_boot.rb
 - lib/ext/app_util.rb
 - lib/ext/eruby_view.rb
 - lib/ext/form_helpers.rb
@@ -64,7 +66,7 @@ files:
 - lib/ext/active_record.rb
 - lib/ext/view.rb
 - lib/ext/view_slot.rb
-- lib/more/typecast.rb
+- lib/ext/command.rb
 - share/js
 - share/js/prototype.js
 - share/js/date_ext.js
@@ -75,7 +77,7 @@ test_files: []
 
 rdoc_options: 
 - --title
-- Equipment
+- Equipment (for Camping)
 - --main
 - README
 - --line-numbers
@@ -83,11 +85,19 @@ extra_rdoc_files:
 - README
 - LICENSE
 - CHANGES
-executables: []
-
+executables: 
+- camping_command
 extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: camping
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.4.157
+    version: 

data/lib/more/typecast.rb

@@ -1,288 +0,0 @@
-# = typecast.rb
-#
-# == Copyright (c) 2004 Jonas Pfenniger
-#
-#   Ruby License
-#
-#   This module is free software. You may use, modify, and/or redistribute this
-#   software under the same terms as Ruby.
-#
-#   This program is distributed in the hope that it will be useful, but WITHOUT
-#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#   FOR A PARTICULAR PURPOSE.
-#
-# == Author(s)
-#
-# * Jonas Pfenniger
-#
-# == Changelog
-#
-# 06.06.2006 - 3v1l d4y
-#
-#  * Removed transformation options.
-#  * Removed StringIO typecast. It is not required by default.
-#  * Added TypeCastException for better error reporting while coding.
-#
-# == Developer Notes
-#
-#   TODO Consider how this might fit in with method signitures, overloading,
-#        and expiremental euphoria-like type system.
-#
-#   TODO Look to implement to_int, to_mailtext, to_r, to_rfc822text and to_str.
-
-
-# Author::    Jonas Pfenniger
-# Copyright:: Copyright (c) 2004 Jonas Pfenniger
-# License::   Ruby License
-
-require 'time'
-
-require 'facet/string/methodize'
-require 'facet/string/modulize'
-
-# = TypeCast
-#
-# Provides a generic simple type conversion utility. All the ruby core
-# conversions are available by default.
-#
-# To implement a new type conversion, you have two choices :
-#
-# Take :
-#
-#  class CustomType
-#    def initialize(my_var)
-#      @my_var = my_var
-#    end
-#  end
-#
-# * Define a to_class_name instance method
-#
-#  class CustomType
-#    def to_string
-#      my_var.to_s
-#    end
-#  end
-#
-#  c = CustomType.new 1234
-#  s.cast_to String   =>  "1234" (String)
-#
-# * Define a from_class_name class method
-#
-#  class CustomType
-#    def self.from_string(str)
-#      self.new(str)
-#    end
-#  end
-#
-#  "1234".cast_to CustomType  =>  #<CustomType:0xb7d1958c @my_var="1234">
-#
-#
-# Those two methods are equivalent in the result. It was coded like that to
-# avoid the pollution of core classes with tons of to_* methods.
-#
-# The standard methods to_s, to_f, to_i, to_a and to_sym are also used by
-# this system if available.
-#
-# == Usage
-#
-#  "1234".cast_to Float     => 1234.0  (Float)
-#  Time.cast_from("6:30")   => 1234.0   (Time)
-#
-# == FAQ
-#
-# Why didn't you name the `cast_to` method to `to` ?
-#
-#   Even if it would make the syntax more friendly, I suspect it could cause
-#   a lot of collisions with already existing code. The goal is that each
-#   time you call cast_to, you either get your result, either a
-#   TypeCastException
-#
-
-class TypeCastException < Exception; end
-
-#
-
-class Object
-
-  # class TypeCastException < Exception; end
-
-  # Cast an object to another
-  #
-  #    1234.cast_to(String)  => "1234"
-  #
-  def cast_to(klass)
-    klass.cast_from(self)
-  end
-
-  # Cast on object from another
-  #
-  #   String.cast_from(1234) => "1234"
-  #
-  def cast_from(object)
-    method_to = "to_#{self.name.methodize}".to_sym
-    if object.respond_to? method_to
-      retval = object.send(method_to)
-      return retval
-    end
-
-    method_from = "from_#{object.class.name.methodize}".to_sym
-    if respond_to? method_from
-      retval = send(method_from, object)
-      return retval
-    end
-
-    raise TypeCastException, "TypeCasting from #{object.class.name} to #{self.name} not supported"
-  end
-end
-
-# Extend the ruby core
-
-class Array
-  class << self
-    def cast_from(object)
-      return super
-    rescue TypeCastException
-      return object.to_a if object.respond_to? :to_a
-      raise
-    end
-  end
-end
-
-class Float
-  class << self
-    def cast_from(object)
-      return super
-    rescue TypeCastException
-      return object.to_f if object.respond_to? :to_f
-      raise
-    end
-  end
-end
-
-class Integer
-  class << self
-    def cast_from(object)
-      return super
-    rescue TypeCastException
-      return object.to_i if object.respond_to? :to_i
-      raise
-    end
-  end
-end
-
-class String
-  class << self
-    def cast_from(object)
-      return super
-    rescue TypeCastException
-      return object.to_s if object.respond_to? :to_s
-      raise
-    end
-  end
-end
-
-class Symbol
-  class << self
-    def cast_from(object)
-      return super
-    rescue TypeCastException
-      return object.to_sym if object.respond_to? :to_sym
-      raise
-    end
-  end
-end
-
-# Extensions
-
-class Class
-  class << self
-
-    # "string".cast_to Class         #=> String
-
-    def from_string(string)
-      string = string.to_s.modulize
-      base   = string.sub!(/^::/, '') ? Object : (self.kind_of?(Module) ? self : self.class )
-      klass  = string.split(/::/).inject(base){ |mod, name| mod.const_get(name) }
-      return klass if klass.kind_of? Class
-      nil
-    rescue
-      nil
-    end
-
-    alias_method :from_symbol, :from_string
-
-  end
-end
-
-class Time
-  class << self
-    def from_string(string, options={})
-      parse(string)
-    rescue
-      nil
-    end
-  end
-end
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-
-  class TestClass
-    attr_accessor :my_var
-    def initialize(my_var); @my_var = my_var; end
-
-    def to_string(options={})
-      @my_var
-    end
-
-    class << self
-      def from_string(string, options={})
-        self.new( string )
-      end
-    end
-  end
-
-  class TC_TypeCast < Test::Unit::TestCase
-
-    def setup
-      @test_string = "this is a test"
-      @test_class = TestClass.new(@test_string)
-    end
-
-    def test_to_string
-      assert_equal( '1234', 1234.cast_to(String) )
-    end
-
-    def test_custom_to_string
-      assert_equal( @test_string, @test_class.cast_to(String) )
-    end
-
-    def test_custom_from_string
-      assert_equal( @test_class.my_var, @test_string.cast_to(TestClass).my_var )
-    end
-
-    def test_string_to_class
-      assert_equal( Test::Unit::TestCase, "Test::Unit::TestCase".cast_to(Class) )
-    end
-
-    def test_string_to_time
-      assert_equal( "Mon Oct 10 00:00:00 2005", "2005-10-10".cast_to(Time).strftime("%a %b %d %H:%M:%S %Y") )
-    end
-
-    def test_no_converter
-      "sfddsf".cast_to( ::Regexp )
-      assert(1+1==3, 'should not get here')
-    rescue TypeCastException => ex
-      assert_equal(TypeCastException, ex.class)
-    end
-  end
-
-=end