kiss 1.7.2 → 1.7.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2010 MultiWidget LLC.
+Copyright (c) 2005-2012 AppJudo Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -26,6 +26,7 @@ spec = Gem::Specification.new do |s|
     s.add_dependency('sequel','>=3.0.0')
     s.add_dependency('erubis')
     s.add_dependency('tzinfo')
+    s.add_dependency('highline')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.7.4

data/bin/kiss

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'kiss'
 require 'optparse'
 require 'irb'
+require 'highline'
 
 def main
   parse_options
@@ -13,7 +14,11 @@ def main
   
   case command
   when 'create'
-    create
+    if ARGV.shift == 'db'
+      create_db
+    else
+      create_app
+    end
   when 'run'
     run
   when 'irb'
@@ -22,6 +27,14 @@ def main
     set
   when 'evolve'
     evolve
+  when 'db'
+    db_command = ARGV.shift
+    case db_command
+    when 'create'
+      create_db
+    else
+      open_db_prompt
+    end
   when 'help'
     display_usage(ARGV[0])
   else
@@ -74,7 +87,7 @@ rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
   Kernel::exit 1
 end
 
-def create
+def create_app
   archive_path = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'data','scaffold.tgz')
 
   Dir.mkdir($project_dir) unless File.directory?($project_dir)
@@ -85,6 +98,40 @@ def create
   puts 'Kiss application scaffold created.'
 end
 
+def create_db
+  app = load_kiss_project
+  database_config = app.config.database
+  if database_config.adapter != 'mysql'
+    puts 'The Kiss command-line tool supports only MySQL databases.'
+  end
+  
+  root_password = HighLine.new.ask("Enter MySQL root password: ") { |q| q.echo = false }
+  root_database_config = {
+    :adapter => 'mysql',
+    :host => database_config.host,
+    :database => 'mysql',
+    :user => 'root',
+    :password => root_password
+  }
+  
+  root_db = app.new_database_connection(root_database_config)
+	root_db.execute("CREATE DATABASE IF NOT EXISTS `#{database_config.database}` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
+	root_db.execute("GRANT ALL PRIVILEGES ON #{database_config.database}.* TO #{database_config.user}\@localhost IDENTIFIED BY '#{database_config.password}' WITH GRANT OPTION")
+	root_db.execute("FLUSH PRIVILEGES")
+  
+  puts "Created MySQL database '#{database_config.database}' and user '#{database_config.user}'."
+end
+
+def open_db_prompt
+  app = load_kiss_project
+  database_config = app.config.database
+  if database_config.adapter != 'mysql'
+    puts 'The Kiss command-line tool supports only MySQL databases.'
+  end
+  
+  Kernel.exec %Q(mysql -u #{database_config.user} #{"-p#{database_config.password}".inspect} #{database_config.database})
+end
+
 def load_kiss_project
   Kiss.load
 end

data/lib/kiss.rb

@@ -343,6 +343,12 @@ class Kiss
     Kiss::Request.new(env, self, @_config).call(env)
   end
   
+  def new_database_connection(database_config)
+    db = Sequel.connect database_config
+    load_db_class_extensions(db.class)
+    db
+  end
+  
   # Acquires and returns a database connection object from the connection pool,
   # opening a new connection if the pool is empty.
   def database
@@ -350,8 +356,7 @@ class Kiss
       raise 'database config missing' unless @_database_config
     
       # open database connection
-      db = Sequel.connect @_database_config
-      load_db_class_extensions(db.class)
+      db = new_database_connection(@_database_config)
       
       # create model cache for this database connection
       db.kiss_controller = self

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 2
-  version: 1.7.2
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -69,6 +69,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: 
 email: shawn @nospam@ multiwidget.com
 executables: