dev_osx_updater 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18545acb63f3a29f29a598482aa1db3528fddf1a
-  data.tar.gz: 90b5475c8e02572328d34d052bf4f3766da355cf
+  metadata.gz: a356d95021105f5e9866fe18df46ce46ca911419
+  data.tar.gz: a149cb4561f787eec6d526669aa516671468e05f
 SHA512:
-  metadata.gz: b35ecc0efa19b2c7acb287a87fa98c6705bce32f1721d13a690a7887594246e70295eec4d134c6a0eb478579f96a7751844f151689c8c5a0c2651ec7995cbbe5
-  data.tar.gz: d0ed3cb26ad1769f3724c366c681820b1c6e2dd56e9222c76a7956ba1658fdc25e1cc920e886237cebad358fc2d032274df389966ff4514e6f4dde22d793aa14
+  metadata.gz: 36519f950073d0098523839c0314452f8d494544bf03f5928e2a1ca60fdd3fdec03e01f7680dc2a677ed479d7b0dfb2eea4180cfbb6aa00e63af8a5e50799b08
+  data.tar.gz: 9920501e4a6c93cfa8ccf0450b5ae2f87c99b5530a322f38913d58cf83d10de104903f86532de646760018e07a9dcd834d443f085cc9395f4c4eaf440b1eae20

data/bin/dev_osx_update

@@ -1,10 +1,14 @@
 #!/usr/bin/env ruby
 
-os = Gem::Platform.local
+require 'colorize'
+
+if Gem::Platform.local.os.include?('darwin')
+  require 'system'
 
-if os.to_s =~ /[darwin]/i
-  require File.join(File.dirname(__FILE__), '..', 'lib', 'system')
   System::Update.new.perform
 else
-  puts 'This program currently requires Mac OSX to run. In a future release we hope to make it Linux compatible.'.colorize(:red).bold
+  puts %(
+    This program currently requires Mac OSX to run.
+    In a future release we hope to make it Linux compatible.
+  ).colorize(:red).bold
 end

data/lib/dev_osx_updater/version.rb

@@ -1,3 +1,3 @@
 module DevOsxUpdater
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/osx.rb

@@ -57,11 +57,12 @@ class OSX
     end
 
     def repair_disk_permissions
-      puts '| Repairing OSX disk permissions'.bold
+      puts '| Repairing OSX disk permissions...'.bold
       if run?
         Open3.popen2e('diskutil repairPermissions /') do |stdin, stdout_err, wait_thr|
           while line = stdout_err.gets
             puts line.delete!("\n").indent(4).colorize(:green)
+            break_output
           end
 
           exit_status = wait_thr.value
@@ -75,4 +76,4 @@ class OSX
       end
     end
   end
-end
+end

data/lib/ruby.rb

@@ -23,7 +23,7 @@ class Ruby
       current = %x(bundler -v).delete!("Bundler version\n")
       latest = @response['version']
 
-      if current == nil || Gem::Version.new(current) < Gem::Version.new(latest)
+      if current.nil? || Gem::Version.new(current) < Gem::Version.new(latest)
         system 'gem install bundler'
       else
         puts "  - You currently have Bundler #{current} installed which is the latest version.".colorize(:green)

data/lib/rvm.rb

@@ -17,7 +17,7 @@ class RVM
       cleanup_message('RVM')
       if run?
         begin
-          PTY.spawn('rvm cleanup all') do |stdin, stdout, stderr, thread|
+          PTY.spawn('rvm cleanup all') do |stdin, _stdout, _stderr, _thread|
             begin
               stdin.each { |line| print line.indent(2) }
             rescue Errno::EIO

data/lib/system.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH << File.expand_path('..', __FILE__)
-
 # Gems
 require 'colorize'
 require 'open3'

data/lib/utility.rb

@@ -10,12 +10,12 @@ end
 
 String.class_eval do
   def indent(count, char = ' ')
-    gsub(/([^\n]*)(\n|$)/) do |match|
-      last_iteration = ($1 == '' && $2 == '')
+    gsub(/([^\n]*)(\n|$)/) do
+      last_iteration = (Regexp.last_match(1) == '' && Regexp.last_match(2) == '')
       line = ''
       line << (char * count) unless last_iteration
-      line << $1
-      line << $2
+      line << Regexp.last_match(1)
+      line << Regexp.last_match(2)
       line
     end
   end
@@ -48,13 +48,15 @@ def yes_or_no
   elsif str == 'n'
     return false
   else
-    raise 'Invalid choice. Options are "y" or "n"'
+    puts '  - Invalid choice!'.colorize(:red).bold
+    print '  - Options are "y" or "n" - Please try again! (y/n) '
+    yes_or_no
   end
 end
 
 def run?
   return true if System::Update::AUTO_RUN == '--auto'
 
-  print "  - Do you want to perform this action? (y/n) "
+  print '  - Do you want to perform this action? (y/n) '
   yes_or_no
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dev_osx_updater
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Callum Barratt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,20 +42,20 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 description: Keep your development tools such as homebrew, zsh, rubygems etc up to
   date with a simple informative script.
 email:
-- callum@bolser.co.uk
+- callum@barratt.me
 executables:
 - dev_osx_update
 extensions: []
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Updates Ruby/Rails development related tools and software.