dory 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd130b3cf0b939ac79261dced4f91430d1c391ba
-  data.tar.gz: 2f7465a0c96d42c3a13f2d725f8b8f8e0c931a9d
+  metadata.gz: 32d77f426394ec85bbbe2bab82c51827a606b5f3
+  data.tar.gz: 3c1f263e12aeb27daa447956eafd76cb8d2784af
 SHA512:
-  metadata.gz: 2efd954506347e634028b6c5f7aebd0305736eba68921d3e415574bc5922def0bc4a17639054e60cfdf4796dda0b8b23b5ecd32f1e3e453a107a6f3b731e4ea5
-  data.tar.gz: 2393eac90e2b129a9cc60d77c1f6f35fe3bd63771d7454d129ad75769e6ce8dbeb4a1e920588f650a23f335a2f7114c5cc267643a029f17dc1e291154de12508
+  metadata.gz: 4b6628655fa991c06bf885fac5e5e51a9e8529d0cf2e7ab89e9ac71d0ce4770f37e34ace70b03697f5c909b707e84bab711305387a31c62d2a62c6fe857fcb93
+  data.tar.gz: 32bcb7f13b507fb798f6e4882f4a4640edd31630e5a3b7578a3416273650001ffbe9d9f57850bcf56566f9a8e66e001158bcb74c558190b7540453daeb4fea26

data/bin/dory

@@ -69,23 +69,45 @@ class DoryBin < Thor
     containing the default settings.  This can then be configured
     as preferred.
   LONGDESC
+  option :upgrade, type: :boolean, aliases: 'u', default: false
+  option :force, type: :boolean, aliases: 'f', default: false
   def config_file
     exec_config_file(options)
   end
 
   private
 
-  def exec_config_file(_options)
+  def config_file_action(options)
+    if options[:upgrade]
+      'u'
+    elsif options[:force]
+      'o'
+    else
+      print "A config file already exists at #{Dory::Config.filename}.  [U]pgrade, [O]verwrite with default settings, or do [N]othing? (U/O/N): ".yellow
+      STDIN.gets.chomp
+    end
+  end
+
+  def take_action(action)
+    if action =~ /u/i
+      puts "Upgrading config file at #{Dory::Config.filename}".green
+      Dory::Config.upgrade_settings_file
+    elsif action =~ /o/i
+      puts "Overwriting config file with new version at #{Dory::Config.filename}".green
+      Dory::Config.write_default_settings_file
+    else
+      puts "User declined.  Not writing config file".red
+      return
+    end
+  end
+
+  def exec_config_file(options)
     if File.exist?(Dory::Config.filename)
-      print "A config file already exists at #{Dory::Config.filename}.  Overwrite with default settings? (Y/N): ".yellow
-      conf = STDIN.gets.chomp
-      unless conf =~ /y/i
-        puts "User declined over-writing.  Not writing config file".red
-        return
-      end
+      take_action(config_file_action(options))
+    else
+      puts "Writing new config file to #{Dory::Config.filename}".green
+      Dory::Config.write_default_settings_file
     end
-    puts "Writing config file to #{Dory::Config.filename}".green
-    Dory::Config.write_default_settings_file
   end
 
   def exec_up(options)

data/lib/dory/config.rb

@@ -57,6 +57,7 @@ module Dory
 
     def self.write_settings(settings, filename = self.filename, is_yaml: false)
       settings = settings.to_yaml unless is_yaml
+      settings.gsub!(/\s*!ruby\/hash:ActiveSupport::HashWithIndifferentAccess/, '')
       File.write(filename, settings)
     end
 

data/lib/dory/docker_service.rb

@@ -13,21 +13,19 @@ module Dory
     end
 
     def start(handle_error: true)
-      unless self.running?
+      if self.running?
+        puts "Container '#{self.container_name}' is already running"
+      else
         self.run_preconditions
-        status = if self.container_exists?
-                   if Dory::Config.debug?
-                     puts "[DEBUG] Container '#{self.container_name}' already exists.  " \
-                          "Starting with '#{self.start_cmd}'"
-                   end
-                   Sh.run_command(self.start_cmd)
-                 else
-                   if Dory::Config.debug?
-                     puts "[DEBUG] Container '#{self.container_name}' does not exist.  " \
-                          "Creating/starting with '#{self.run_command}'"
-                   end
-                   Sh.run_command(self.run_command)
-                 end
+        if self.container_exists?
+           puts "[DEBUG] Container '#{self.container_name}' exists.  Deleting"
+           self.delete
+        end
+        if Dory::Config.debug?
+          puts "[DEBUG] does not exist.  Creating/starting " \
+               "'#{self.container_name}' with '#{self.run_command}'"
+        end
+        status = Sh.run_command(self.run_command)
         unless status.success?
           if !handle_error || !self.handle_error(status)
             raise RuntimeError.new(

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   DATE    = '2016-06-09'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Porter