open_geo_db 0.0.1 → 0.0.2

data/README.md

@@ -1,24 +1,35 @@
 # OpenGeoDb
 
-TODO: Write a gem description
+A simple Gem for creating and destroying MySQL databases containing data
+from the "OpenGeoDB" project (http://opengeodb.giswiki.org/wiki/OpenGeoDB).
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'open_geo_db'
+```ruby
+gem("open_geo_db")
+```
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install open_geo_db
+```bash
+$ gem install open_geo_db
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+For detailed usage run:
+
+```bash
+$ bundle exec open_geo_db --help
+```
 
 ## Contributing
 

data/lib/open_geo_db/cli.rb

@@ -5,54 +5,39 @@ module OpenGeoDb
   class CLI
     include Mixlib::CLI
 
-    option(:action,
-       :required => true,
-       :short => "-a ACTION",
-       :long => "--action ACTION",
-       :proc => Proc.new { |l| l.to_sym },
-       :description => "Action to do (`create` or `destroy`)")
+    DEFAULT_CONFIG = {"open_geo_db" =>
+        {"database" => "open_geo_db", "username" => "root", "password" => ""}}
 
-    option(:config,
-        :default => "open_geo_db.yml",
-        :short => "-c CONFIG",
-        :long => "--config CONFIG",
-        :description => "The configuration file to use (default `open_geo_db.yml`)")
+    def self.action_option(name, description)
+      option(name, :short => "-#{name.to_s[0].chr} config", :long => "--#{name} CONFIG",
+          :description => description)
+    end
+
+    action_option(:create, "Create database with config file CONFIG")
+    action_option(:destroy, "Destroy database with config file CONFIG")
+    action_option(:generate, "Generate config file CONFIG")
 
-    option(:help,
-        :boolean => true,
-        :on => :tail,
-        :short => "-h",
-        :long => "--help",
-        :description => "Show this message",
-        :show_options => true,
-        :exit => 0)
+    option(:help, :boolean => true, :on => :tail, :short => "-h", :long => "--help",
+        :description => "Show this message", :show_options => true, :exit => 0)
 
     def run
       parse_options
-
-      if File.exist?(config[:config])
-        yaml = YAML.load_file(config[:config])["open_geo_db"]
-        @database = yaml["database"]
-        @username = yaml["username"]
-        @password = "-p#{yaml["password"]}" if yaml["password"] and yaml["password"].any?
-      end
-      @database ||= "open_geo_db"
-      @username ||= "root"
-
-      action = config[:action]
-
-      case action
-      when :create then create
-      when :destroy then destroy
-      else
-        puts("Unknown action `#{action}`. For usage see `open_geo_db --help`")
-        exit 1
-      end
+      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")
@@ -61,9 +46,16 @@ module OpenGeoDb
     end
 
     def destroy
+      load_config
       sh("mysqladmin -u#{@username} #{@password} drop -f #{@database}")
     end
 
+    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}}

data/lib/open_geo_db/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: open_geo_db
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kostiantyn Kahanskyi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-cli
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Create and destroy OpenGeoDb databases