dm-cli 0.9.5 → 0.9.6

data/Rakefile

@@ -46,7 +46,7 @@ end
 desc "Run specifications"
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << "--options" << "spec/spec.opts" if File.exists?("spec/spec.opts")
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + "spec/**/*_spec.rb")
+  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
 
   begin
     t.rcov = ENV.has_key?("NO_RCOV") ? ENV["NO_RCOV"] != "true" : true

data/bin/dm

@@ -3,9 +3,8 @@ require "rubygems"
 
 gem "dm-core", ">=0.9.5"
 require "dm-core"
-require "pathname"
-require Pathname("data_mapper/cli")
+require "dm-cli"
 require "optparse"
 
 DataMapper::CLI::BinDir = File.dirname(__FILE__)
-DataMapper::CLI.start
+DataMapper::CLI.start

data/lib/dm-cli/cli.rb

@@ -17,15 +17,19 @@ dm - Data Mapper CLI
 
   Usage Examples\n#{'='*80}
 
-* If exactly one argument is given the CLI assumes it is a connection string:
+* If one argument is given the CLI assumes it is a connection string:
   $ dm mysql://root@localhost/test_development
 
   The connection string has the format:
     adapter://user:password@host:port/database
   Where adapter is in: {mysql, pgsql, sqlite...} and the user/password is optional
 
-* Load the database by specifying only cli options
-  $ dm -a mysql -u root -h localhost -d test_development -e developemnt
+  Note that if there are any non-optional arguments specified, the first is
+  assumed to be a database connection string which will be used instead of any
+  database specified by options.
+
+* Load the database by specifying cli options
+  $ dm -a mysql -u root -h localhost -d test_development
 
 * Load the database using a yaml config file and specifying the environment to use
   $ dm --yaml config/database.yml -e development
@@ -41,6 +45,12 @@ dm - Data Mapper CLI
 
   This is similar to merb -i without the merb framework being loaded.
 
+* Load the dm-validations and dm-timestamps plugins before connecting to the db
+  $ dm -P validations,dm-timestamps mysql://root@localhost/test_development
+
+  If dm- isn't at the start of the file, it will be prepended.
+
+
 USAGE
       end
 
@@ -77,8 +87,8 @@ USAGE
             end
           end
 
-          opt.on("-l", "--log LOGFILE", "A string representing the logfile to use.") do |log_file|
-            @config[:log_file] = Pathname(log_file)
+          opt.on("-l", "--log LOGFILE", "A string representing the logfile to use. Also accepts STDERR and STDOUT") do |log_file|
+            @config[:log_file] = log_file
           end
 
           opt.on("-e", "--environment STRING", "Run merb in the correct mode(development, production, testing)") do |environment|
@@ -113,6 +123,10 @@ USAGE
             @config[:database] = database_name
           end
 
+          opt.on("-P", "--plugins PLUGIN,PLUGIN...", "A list of dm-plugins to require", Array) do |plugins|
+            @config[:plugins] = plugins
+          end
+
           opt.on("-?", "-H", "--help", "Show this help message") do
             puts opt
             exit
@@ -123,42 +137,57 @@ USAGE
       end
 
       def configure(args)
-        if args[0] && args[0].match(/^(.+):\/\/(?:(.*)(?::(.+))?@)?(.+)\/(.+)$/)
+
+        parse_args(args)
+
+        @config[:environment] ||= "development"
+        if @config[:config]
+          @config.merge!(YAML::load_file(@config[:config]))
+          @options = @config[:options]
+        elsif @config[:yaml]
+          @config.merge!(YAML::load_file(@config[:yaml]))
+          @options = @config[@config[:environment]] || @config[@config[:environment].to_sym]
+          raise "Options for environment '#{@config[:environment]}' are missing." if @options.nil?
+        else
           @options = {
-            :adapter  => $1,
-            :username => $2,
-            :password => $3,
-            :host     => $4,
-            :database => $5
+            :adapter  => @config[:adapter],
+            :username => @config[:username],
+            :password => @config[:password],
+            :host     => @config[:host],
+            :database => @config[:database]
           }
-          @config = @options.merge(:connection_string => ARGV.shift)
-        else
+        end
+        if !ARGV.empty?
+          @config[:connection_string] = ARGV.shift
+        end
 
-          parse_args(args)
+      end
 
-          @config[:environment] ||= "development"
-          if @config[:config]
-            @config.merge!(YAML::load_file(@config[:config]))
-            @options = @config[:options]
-          elsif @config[:yaml]
-            @config.merge!(YAML::load_file(@config[:yaml]))
-            @options = @config[@config[:environment]] || @config[@config[:environment].to_sym]
-            raise "Options for environment '#{@config[:environment]}' are missing." if @options.nil?
-          else
-            @options = {
-              :adapter  => @config[:adapter],
-              :username => @config[:username],
-              :password => @config[:password],
-              :host     => @config[:host],
-              :database => @config[:database]
-            }
-          end
+      def load_models
+        Pathname.glob("#{config[:models]}/**/*.rb") { |file| load file }
+      end
 
+      def require_plugins
+        # make sure we're loading dm plugins!
+        plugins = config[:plugins].map {|p| (p =~ /^dm/) ? p : "dm-" + p }
+        plugins.each do |plugin|
+          begin
+            require plugin
+            puts "required #{plugin}."
+          rescue LoadError => e
+            puts "couldn't load #{plugin}."
+          end
         end
       end
 
-      def load_models
-        Pathname.glob("#{config[:models]}/**/*.rb") { |file| load file }
+      def setup_logger
+        if config[:log_file] =~ /^std(?:out|err)$/i
+          log = Object.full_const_get(config[:log_file].upcase)
+        else
+          log = Pathname(config[:log_file])
+        end
+
+        DataMapper::Logger.new(log, :debug)
       end
 
       def start(argv = ARGV)
@@ -169,10 +198,20 @@ USAGE
 
         begin
           configure(argv)
-          DataMapper.setup(:default, options.dup)
+
+          require_plugins if config[:plugins]
+
+          setup_logger if config[:log_file]
+
+          if config[:connection_string]
+            DataMapper.setup(:default, config[:connection_string])
+            puts "DataMapper has been loaded using '#{config[:connection_string]}'"
+          else
+            DataMapper.setup(:default, options.dup)
+            puts "DataMapper has been loaded using the '#{options[:adapter] || options["adapter"]}' database '#{options[:database] || options["database"]}' on '#{options[:host] || options["host"]}' as '#{options[:username] || options["username"]}'"
+          end
           load_models if config[:models]
-          puts "DataMapper has been loaded using the '#{options[:adapter] || options["adapter"]}' database '#{options[:database] || options["database"]}' on '#{options[:host] || options["host"]}' as '#{options[:username] || options["username"]}'"
-          ENV["IRBRC"] = DataMapper::CLI::BinDir + "/.irbrc" # Do not change this please. This should NOT be DataMapper.root
+          ENV["IRBRC"] ||= DataMapper::CLI::BinDir + "/.irbrc" # Do not change this please. This should NOT be DataMapper.root
           IRB.start
         rescue => error
           puts error.message

data/lib/dm-cli/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class CLI
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-cli
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe