dynamodb-ruby 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c257312be4a3b3beb1872f2dbd95b302cc07a5e4
-  data.tar.gz: e6ae659246529009d91a8b53df17b557d0e4c628
+  metadata.gz: 13acc9105ae20762765fab21f6d8b783e08775c9
+  data.tar.gz: c82868b55994ae5574352fa256fdac0a1a682edf
 SHA512:
-  metadata.gz: 7cd1c9e747783f8cad8b6c53df6281b8fabc1ded9641ec7504a41fc5c2c2a7002f7ce27800c6c62fee753ed1c0f24ffba3ac5df97bc19dfe840808df00bcacd0
-  data.tar.gz: af53e9164e0d03f08eec079229378e534cce3ad09d4b7a3726e5ce2c6b1151c2f226ca922e492c532224ced578767dcc588917c1646eddc618309c190bf22ce8
+  metadata.gz: d2be0c56bfcaa1ee057e81b47c9f8c2fc668716130275b4951d9a793048a60fbb4134b40f62f03b518baed32aeae866d378d49e07245c7d4365cc50b4293b8a8
+  data.tar.gz: 4ef5670408ce6bbe95631134d4f091f42bea177bd0042fcefca8e2e6e85365f2f2a6ee20561fe9954122d6762a87d030a66c9197d790710281b51739ba2157a7

data/lib/dynamodb/cli.rb

@@ -2,16 +2,16 @@ require "thor"
 
 module Dynamodb
   class CLI < Thor
-    DIST_DIR = "vendor/DynamoDBLocal-latest"
+    DIST_DIR = "./vendor/DynamoDBLocal-latest"
     PIDFILE = "dynamodb.pid"
     PORT = 8000
     LOG_DIR = "logs"
 
     desc "start", "Starts Dynamodb Local"
-    method_option :dist_dir, aliases: "-dd"
-    method_option :pidfile,  aliases: "-pf"
-    method_option :port,     aliases: "-p"
-    method_option :log_dir,  aliases: "-ld"
+    method_option :dist_dir, aliases: "-dd", default: DIST_DIR
+    method_option :pidfile,  aliases: "-pf", default: PIDFILE
+    method_option :port,     aliases: "-p", default: PORT
+    method_option :log_dir,  aliases: "-ld", default: LOG_DIR
     def start
       %x(
         if [ -z $JAVA_HOME ]; then
@@ -27,24 +27,22 @@ module Dynamodb
       )
 
       dist_dir = options[:dist_dir] || DIST_DIR
-      `cd #{dist_dir}`
+      `cd #{options[:dist_dir]}`
 
       %x(
         if [ ! -f DynamoDBLocal.jar ] || [ ! -d DynamoDBLocal_lib ]; then
-          echo >&2 "ERROR: Could not find DynamoDBLocal files in #{dist_dir}."
+          echo >&2 "ERROR: Could not find DynamoDBLocal files in #{options[:dist_dir]}."
           exit 1
         fi
       )
 
-      log_dir = options[:log_dir] || LOG_DIR
-      `mkdir -p  #{log_dir}`
+      `mkdir -p  #{options[:log_dir]}`
 
-      puts "DynamoDB Local output will save to #{dist_dir}/#{log_dir}/"
+      puts "DynamoDB Local output will save to #{options[:dist_dir]}/#{options[:log_dir]}/"
 
-      port = options[:port] || PORT
-      `hash lsof 2>/dev/null && lsof -i :#{port} && { echo >&2 "Something is already listening on port #{port}; I will not attempt to start DynamoDBLocal."; exit 1; }`
+      `hash lsof 2>/dev/null && lsof -i :#{options[:port]} && { echo >&2 "Something is already listening on port #{options[:port]}; I will not attempt to start DynamoDBLocal."; exit 1; }`
 
-      `nohup $JAVA_HOME/bin/java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -delayTransientStatuses -port #{port} -inMemory 1>"#{log_dir}/output.log" 2>"#{log_dir}/error.log" &`
+      `nohup $JAVA_HOME/bin/java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -delayTransientStatuses -port #{options[:port]} -inMemory 1>"#{options[:log_dir]}/output.log" 2>"#{options[:log_dir]}/error.log" &`
       `PID=$!`
 
       puts "Verifying that DynamoDBLocal actually started..."
@@ -64,31 +62,28 @@ module Dynamodb
         done
       )
 
-      puts "DynamoDB Local started with pid #{`$PID`} listening on port #{port}."
+      puts "DynamoDB Local started with pid #{`$PID`} listening on port #{options[:port]}."
 
-      pidfile = options[:pidfile] || PIDFILE
-      puts `$PID > #{pidfile}`
+      puts `$PID > #{options[:pidfile]}`
     end
 
     desc "stop", "Stops Dynamodb Local"
-    method_option :dist_dir, aliases: "-dd"
-    method_option :pidfile,  aliases: "-pf"
-    method_option :port,     aliases: "-p"
-    method_option :log_dir,  aliases: "-ld"
+    method_option :dist_dir, aliases: "-dd", default: DIST_DIR
+    method_option :pidfile,  aliases: "-pf", default: PIDFILE
+    method_option :port,     aliases: "-p", default: PORT
+    method_option :log_dir,  aliases: "-ld", default: LOG_DIR
     def stop
-      dist_dir = options[:dist_dir] || DIST_DIR
-      `cd #{dist_dir}`
+      `cd #{options[:dist_dir]}`
 
-      pidfile = options[:pidfile] || PIDFILE
       %x(
-        if [ ! -f #{pidfile} ]; then
+        if [ ! -f #{options[:pidfile]} ]; then
           echo 'ERROR: There is no pidfile, below is the list of DynamoDBLocal processes you may need to kill.'
           ps -e | grep DynamoDBLocal | grep -v grep
           exit 1
         fi
       )
 
-      `pid=$(<#{pidfile})`
+      `pid=$(<#{options[:pidfile]})`
 
       `echo "Killing DynamoDBLocal at pid $pid..."`
       `kill $pid`
@@ -99,7 +94,7 @@ module Dynamodb
           kill -0 $pid 2>/dev/null
           if [ $? -ne 0 ]; then
             echo 'Successfully shut down DynamoDBLocal.'
-            rm -f #{pidfile}
+            rm -f #{options[:pidfile]}
             exit 0
           else
             echo 'Still waiting for DynamoDBLocal to shut down...'
@@ -113,7 +108,7 @@ module Dynamodb
 
       `ps -e | grep DynamoDBLocal | grep -v grep`
 
-      `rm -f #{pidfile}`
+      `rm -f #{options[:pidfile]}`
 
       `exit 1`
     end

data/lib/dynamodb/version.rb

@@ -1,3 +1,3 @@
 module Dynamodb
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Steve Farrow