dory 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044e607a99a4f25539f2cc21b25bdd44967dbbb3
-  data.tar.gz: bb755b5e86eacfd5d50d4b2e689cd9899e09cd0e
+  metadata.gz: 32c9e4b0eaede749e6fb0ab53d184ca331a74d80
+  data.tar.gz: 4db9c23f23df1b83eca58c423dfea1e6ef5a1d92
 SHA512:
-  metadata.gz: 33a1572f8e8d9d7602f131d87dd950c590b82975ba719c079707161864de56af9f9fbe1e7b6b2c74b9b1527e575ec252ed423d9710d4e9f07e16e289a646d71e
-  data.tar.gz: c614e5556ec5ae284334ac52dea2cc067f7a73a88aaf5a075602eda509ca7ad28cee0224faeaecc2cee633a700f5bedd86ac61afe43f11e1385da875e7314daa
+  metadata.gz: 282ca8afe16ac103b1a134a5c2a4fb834d60e7bc70f589e81e7b07cd24e7839b8925b03fd3eefa0065e3d7bd553fdae495ec2ab88348422ac1c61944ac25ffb3
+  data.tar.gz: 7daa417f20874fcfee2f9bbba23adeada9cc7a30c15353c259f749dd11efb21c1b5348627a3a30a23bb7b27d0d6de2529fd332429c1ef541fa59b9b3f0a400be

data/bin/dory

@@ -8,6 +8,22 @@ require 'dory'
 class DoryBin < Thor
   class_option :verbose, type: :boolean, aliases: 'v', default: false
 
+  desc 'upgrade', 'Upgrade dory to the latest version'
+  long_desc <<-LONGDESC
+    Upgrades dory to the latest version.  Old versions are cleaned up
+
+    If dory was installed with sudo, this may not work.  You will
+    have to do it manually:
+
+      sudo gem install dory   # install the latest versions
+      sudo gem cleanup dory   # cleanup old versions
+
+    > $ dory upgrade
+  LONGDESC
+  def upgrade
+    exec_upgrade(options)
+  end
+
   desc 'up', 'Bring up dory services (nginx-proxy, dnsmasq, resolv)'
   long_desc <<-LONGDESC
     Bring up dory services (nginx-proxy, dnsmasq, resolv)
@@ -77,6 +93,42 @@ class DoryBin < Thor
 
   private
 
+  def exec_upgrade(_options)
+    puts "Checking if dory has updates available...".green
+    new_version = Dory::Upgrade.new_version
+    if new_version
+      if Dory::Upgrade.outdated?(new_version)
+        puts "New version #{new_version} is available.  You currently have #{Dory::VERSION}.".yellow
+        print "Would you like to install the update? (Y/N): ".yellow
+        if STDIN.gets.chomp =~ /y/i
+          puts "Upgrading dory...".green
+          if Dory::Upgrade.install.success?
+            if Dory::Upgrade.cleanup.success?
+              puts "New version installed successfully!\n" \
+                   "You may want to upgrade your config file with:\n\n" \
+                   "    dory config-file --upgrade".green
+            else
+              puts "Failure cleaning up old versions of dory.  You may want " \
+                   "to run 'gem cleanup dory' manually.".red
+            end
+          else
+            puts "Failure installing new version of dory.  If you are " \
+                 "installing into a system ruby, this could be because " \
+                 "you need to use sudo.  Please try 'gem install dory' " \
+                 "manually, and then 'gem cleanup dory' to remove old " \
+                 "versions.".red
+          end
+        else
+          puts "Not upgrading.  User declined.".red
+        end
+      else
+        puts "Dory is up to date!  Nothing to do".green
+      end
+    else
+      puts "Encountered an error checking the latest version from Rubygems".red
+    end
+  end
+
   def config_file_action(options)
     if options[:upgrade]
       'u'
@@ -251,8 +303,9 @@ class DoryBin < Thor
 end
 
 aliases = {
-  'start' => 'up',
-  'stop'  => 'down',
+  'start'  => 'up',
+  'stop'   => 'down',
+  'update' => 'upgrade'
 }
 
 if !ARGV.empty? && %w[-v --version].include?(ARGV.first)

data/lib/dory/upgrade.rb

@@ -0,0 +1,23 @@
+module Dory
+  module Upgrade
+    def self.new_version
+      res = Dory::Sh.run_command('gem search -q dory')
+      return false unless res.success?
+      newver = /dory\s+\((.*)\)/.match(res.stdout)
+      return false if !newver ||  newver.length != 2
+      newver[1]
+    end
+
+    def self.outdated?(new_version = self.new_version)
+      return Dory::VERSION != new_version
+    end
+
+    def self.install
+      Dory::Sh.run_command('gem install dory')
+    end
+
+    def self.cleanup
+      Dory::Sh.run_command('gem cleanup dory')
+    end
+  end
+end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.2.2'
-  DATE    = '2016-06-23'
+  VERSION = '0.2.3'
+  DATE    = '2016-06-24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -140,11 +140,11 @@ files:
 - lib/dory/config.rb
 - lib/dory/dnsmasq.rb
 - lib/dory/docker_service.rb
-- lib/dory/inst_vars_to_hash.rb
 - lib/dory/linux.rb
 - lib/dory/proxy.rb
 - lib/dory/resolv.rb
 - lib/dory/shell.rb
+- lib/dory/upgrade.rb
 - lib/dory/version.rb
 homepage: https://github.com/FreedomBen/dory
 licenses:

data/lib/dory/inst_vars_to_hash.rb

@@ -1,33 +0,0 @@
-module InstVarsToHash
-  def to_s
-    to_h.to_s
-  end
-
-  def to_h
-    retval = {}
-    instance_variables.each do |iv|
-      retval[iv.to_s.delete('@').to_sym] = elem_to_h(instance_variable_get(iv))
-    end
-    retval
-  end
-
-  private
-
-  def expandable_classes
-    [ InstVarsToHash ]
-  end
-
-  def expandable_to_hash(klass)
-    expandable_classes.any?{ |k| klass == k || klass < k }
-  end
-
-  def elem_to_h(elem)
-    if elem.class == Array
-      elem.map { |el| elem_to_h(el) }
-    elsif expandable_to_hash(elem.class)
-      elem.to_h
-    else
-      elem
-    end
-  end
-end