open_geo_db 0.0.2 → 0.0.3

data/lib/open_geo_db/cli.rb

@@ -1,5 +1,6 @@
-require "mixlib/cli"
 require "yaml"
+require "mixlib/cli"
+require "open_geo_db/database"
 
 module OpenGeoDb
   class CLI
@@ -22,43 +23,23 @@ module OpenGeoDb
 
     def run
       parse_options
-      send(config.keys.first)
-    end
-
-    private
-
-    def load_config
-      config_file = config.values.first
-      puts("Using config file #{config_file}")
-      yaml = YAML.load_file(config_file)["open_geo_db"]
-      @database = yaml["database"]
-      @username = yaml["username"]
-      @password = "-p#{yaml["password"]}" if yaml["password"] and yaml["password"].any?
-    end
-
-    def create
-      load_config
-      sh("mysqladmin -u#{@username} #{@password} create #{@database}")
-      %w(opengeodb-begin DE DEhier AT AThier CH CHhier opengeodb-end).each do |basename|
-        file = File.join(File.dirname(__FILE__), %w(.. .. vendor sql), "#{basename}.sql")
-        sh("mysql -u#{@username} #{@password} #{@database} < #{file}")
+      action = config.keys.first
+      @config_file = config.values.first
+      if action == :generate
+        generate
+      else
+        puts("Using config file #{@config_file}")
+        database = OpenGeoDb::Database.new(YAML.load_file(@config_file)["open_geo_db"])
+        database.execute(action)
       end
     end
 
-    def destroy
-      load_config
-      sh("mysqladmin -u#{@username} #{@password} drop -f #{@database}")
-    end
+    private
 
     def generate
-      config_file = config.values.first
-      puts("Writing config to #{config_file}")
-      File.open(config_file, "w") { |f| f.write(DEFAULT_CONFIG.to_yaml) }
-    end
-
-    def sh(command)
-      puts(command)
-      %x{#{command}}
+      @config_file = config.values.first
+      puts("Writing config to #{@config_file}")
+      File.open(@config_file, "w") { |f| f.write(DEFAULT_CONFIG.to_yaml) }
     end
   end
 end

data/lib/open_geo_db/database.rb

@@ -0,0 +1,40 @@
+module OpenGeoDb
+  class Database
+    class UnknownActionError < ArgumentError
+    end
+
+    def initialize(config)
+      @database = config["database"]
+      @username = config["username"]
+      @password = "-p#{config["password"]}" if config["password"] and config["password"].any?
+    end
+
+    def execute(action)
+      case action
+      when :create then create
+      when :destroy then destroy
+      else
+        raise UnknownActionError, action
+      end
+    end
+
+    private
+
+    def create
+      sh("mysqladmin -u#{@username} #{@password} create #{@database}")
+      %w(opengeodb-begin DE DEhier AT AThier CH CHhier opengeodb-end).each do |basename|
+        file = File.join(File.dirname(__FILE__), %w(.. .. vendor sql), "#{basename}.sql")
+        sh("mysql -u#{@username} #{@password} #{@database} < #{file}")
+      end
+    end
+
+    def destroy
+      sh("mysqladmin -u#{@username} #{@password} drop -f #{@database}")
+    end
+
+    def sh(command)
+      puts(command)
+      %x{#{command}}
+    end
+  end
+end

data/lib/open_geo_db/version.rb

@@ -1,3 +1,3 @@
 module OpenGeoDb
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: open_geo_db
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kostiantyn Kahanskyi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-cli
@@ -65,6 +65,7 @@ files:
 - bin/open_geo_db
 - lib/open_geo_db.rb
 - lib/open_geo_db/cli.rb
+- lib/open_geo_db/database.rb
 - lib/open_geo_db/version.rb
 - open_geo_db.gemspec
 - vendor/sql/.gitkeep