dev_osx_updater 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a356d95021105f5e9866fe18df46ce46ca911419
-  data.tar.gz: a149cb4561f787eec6d526669aa516671468e05f
+  metadata.gz: 506aa28b82228df7c09c95f86690307a6ace0459
+  data.tar.gz: 4ce2794a567d1c7811a3036d8395f96c6603a697
 SHA512:
-  metadata.gz: 36519f950073d0098523839c0314452f8d494544bf03f5928e2a1ca60fdd3fdec03e01f7680dc2a677ed479d7b0dfb2eea4180cfbb6aa00e63af8a5e50799b08
-  data.tar.gz: 9920501e4a6c93cfa8ccf0450b5ae2f87c99b5530a322f38913d58cf83d10de104903f86532de646760018e07a9dcd834d443f085cc9395f4c4eaf440b1eae20
+  metadata.gz: 5b33e4ed9f376df8136f1b64436839ee2fe9e853aec303d830509f48281174d4330ab82aceab8f39ccfca9d203c1d80552ab118da66ab037b144990b42ab0633
+  data.tar.gz: 0f7918b008f66c32da962eef53318e119e98038d4ee8d29f39ae75ec5d246d19c9bf782169b89f92cf893e35d91bb705a0723f8b43413c579f0ed554c10a1b95

data/lib/brew.rb

@@ -5,30 +5,32 @@ class Brew
     end
 
     def cleanup
-      cleanup_message('Homebrew')
+      cleanup_message('Homebrew packages')
+
       if run?
-        Open3.popen3('brew cleanup') do |stdin, stdout|
-          output = stdout.read
-          if output.empty?
-            puts '  - Homebrew packages already clean.'.colorize(:green)
-          else
-            puts '  - Cleaned Homebrew packages.'.colorize(:green)
-          end
-        end
+        result, _cmd = Open3.capture2e('brew cleanup')
+
+        puts '  - Homebrew packages already clean.'.colorize(:green) if result.empty?
+        puts '  - Cleaned Homebrew packages.'.colorize(:green) unless result.empty?
       else
         puts '  - Skipped.'.colorize(:red)
       end
+
       break_output
     end
 
+    def info
+      `brew info`.delete!("\n")
+    end
+
     def update
       check_update_message('Homebrew')
-      if %x(brew update | grep Already)
-        puts '  - Homebrew packages already up to date.'.colorize(:green)
-      else
-        puts '  - Updating Homebrew packages...'.colorize(:green)
-        system 'brew update'
-      end
+
+      result, _cmd = Open3.capture2e('brew update')
+
+      puts '  - Homebrew packages already up to date.'.colorize(:green) if result.include?('Already up-to-date')
+      puts '  - Homebrew packages updated.'.colorize(:green) unless result.include?('Already up-to-date')
+
       break_output
     end
   end

data/lib/dev_osx_updater/version.rb

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

data/lib/osx.rb

@@ -31,7 +31,14 @@ class OSX
           - OSX:   #{osx}
           - Host:  #{hostname}
           - RAM:   #{ram}
-          - Ruby:  #{ruby}
+
+        Ruby:
+          - Ruby version:     #{ruby}
+          - RubyGems version: #{Ruby.rubygems_version}
+          - Bundler version:  #{Ruby.bundler_version}
+
+        Homebrew:
+          - Usage: #{Brew.info if Brew.installed?}
       EOS
 
       break_output
@@ -40,14 +47,12 @@ class OSX
     def check_mac_store_updates
       check_update_message('Mac App Store')
       if run?
-        Open3.popen3('softwareupdate -l') do |stdin, stdout, stderr|
+        Open3.popen3('softwareupdate -l') do |_stdin, stdout, stderr|
           output = stdout.read
           error = stderr.read
           updates = output.split(/\r\n|\r|\n/, 5).last
-          if output.include?('Software Update found')
-            puts updates
-            # %x(softwareupdate -i -a) - Commented out as we dont want to auto update yet.
-          end
+
+          puts updates if output.include?('Software Update found')
           puts '  - No new software updates available.' if error.include?('No new software available')
         end
       else
@@ -59,16 +64,15 @@ class OSX
     def repair_disk_permissions
       puts '| Repairing OSX disk permissions...'.bold
       if run?
-        Open3.popen2e('diskutil repairPermissions /') do |stdin, stdout_err, wait_thr|
+        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
-          unless exit_status.success?
-            abort "FAILED !!! #{cmd}"
-          end
+
+          abort "FAILED !!! #{cmd}" unless exit_status.success?
         end
       else
         puts '  - Skipped.'.colorize(:red)

data/lib/pretzo.rb

@@ -0,0 +1,21 @@
+class Pretzo
+  class << self
+    def installed?
+      file_or_folder_exists?('/.zprezto')
+    end
+
+    def update
+      check_update_message('Pretzo')
+
+      result, _cmd = Open3.capture2e('cd ~/.zprezto && git pull && git submodule update --init --recursive')
+
+      if result.include?('Already up-to-date')
+        puts '  - Pretzo already up to date.'.colorize(:green)
+      else
+        puts '  - Updated Pretzo...'.colorize(:green)
+      end
+
+      break_output
+    end
+  end
+end

data/lib/rbenv.rb

@@ -5,11 +5,31 @@ class Rbenv
     end
 
     def update
-      check_update_message('rbenv')
-      Open3.popen3('cd ~/.rbenv && git pull && cd plugins/ruby-build/ && git pull') do |stdin, stdout, stderr, thread|
-        puts '  - rbenv updated.'.colorize(:green)
+      if git_installed?
+        check_update_message('rbenv (git based install)')
+        update_git_based
+      else
+        check_update_message('rbenv (brew based install)')
+        update_brew_based
       end
+
       break_output
     end
+
+    def update_git_based
+      Open3.capture2e('cd ~/.rbenv && git pull && cd plugins/ruby-build/ && git pull')
+      puts '  - rbenv updated.'.colorize(:green)
+    end
+
+    def update_brew_based
+      result, _cmd = Open3.capture2e('brew upgrade rbenv ruby-build')
+
+      puts result.indent(4).colorize(:light_cyan)
+      puts '  - rbenv updated.'.colorize(:green)
+    end
+
+    def git_installed?
+      File.exist? File.expand_path('~/.rbenv/.git')
+    end
   end
 end

data/lib/ruby.rb

@@ -4,7 +4,7 @@ class Ruby
       check_update_message('Rubygems')
       get_gem_json('rubygems-update')
 
-      current = %x(gem -v).delete!("\n")
+      current = rubygems_version
       latest = @response['version']
 
       if Gem::Version.new(current) < Gem::Version.new(latest)
@@ -20,7 +20,7 @@ class Ruby
       check_update_message('Bundler')
       get_gem_json('bundler')
 
-      current = %x(bundler -v).delete!("Bundler version\n")
+      current = bundler_version
       latest = @response['version']
 
       if current.nil? || Gem::Version.new(current) < Gem::Version.new(latest)
@@ -32,6 +32,14 @@ class Ruby
       break_output
     end
 
+    def rubygems_version
+      `gem -v`.delete!("\n")
+    end
+
+    def bundler_version
+      `bundler -v`.delete!("Bundler version\n")
+    end
+
     def get_gem_json(name)
       uri = URI("https://rubygems.org/api/v1/gems/#{name}.json")
       @response = Net::HTTP.get(uri)

data/lib/rvm.rb

@@ -6,10 +6,10 @@ class RVM
 
     def update
       check_update_message('RVM')
-      Open3.popen3('rvm get stable') do |stdin, stdout|
-        output = stdout.read
-        puts '  - RVM updated.'.colorize(:green) if output.include?('RVM reloaded')
-      end
+
+      result, _cmd = Open3.capture2e('rvm get stable')
+      puts '  - RVM updated.'.colorize(:green) if result.include?('RVM reloaded')
+
       break_output
     end
 

data/lib/system.rb

@@ -1,17 +1,16 @@
-# Gems
 require 'colorize'
 require 'open3'
 require 'pty'
 require 'json'
 require 'net/http'
 
-# Local files
 require 'utility'
 require 'rvm'
 require 'brew'
 require 'ruby'
 require 'osx'
 require 'zsh'
+require 'pretzo'
 require 'rbenv'
 
 module System
@@ -20,22 +19,33 @@ module System
 
     def perform
       OSX.system_info
-      Ruby.check_rubygems_version
-      Ruby.check_bundler_version
+      ruby
 
       ZSH.update if ZSH.installed?
+      Pretzo.update if Pretzo.installed?
       Rbenv.update if Rbenv.installed?
 
-      if Brew.installed?
-        Brew.update
-        Brew.cleanup
-      end
+      brew if Brew.installed?
+      rvm if RVM.installed?
+      osx
+    end
+
+    def ruby
+      Ruby.check_rubygems_version
+      Ruby.check_bundler_version
+    end
+
+    def brew
+      Brew.update
+      Brew.cleanup
+    end
 
-      if RVM.installed?
-        RVM.update
-        RVM.cleanup
-      end
+    def rvm
+      RVM.update
+      RVM.cleanup
+    end
 
+    def osx
       OSX.intro
       OSX.check_mac_store_updates
       OSX.repair_disk_permissions

data/lib/zsh.rb

@@ -7,15 +7,14 @@ class ZSH
     def update
       check_update_message('Oh My Zsh')
 
-      Open3.popen3('env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh') do |stdin, stdout|
-        output = stdout.read
-        if output.include?('Current branch master is up to date')
-          puts '  - Oh My Zsh already up to date.'.colorize(:green)
-        else
-          puts '  - Updating Oh My Zsh...'.colorize(:green)
-          system 'env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh'
-        end
+      result, _cmd = Open3.capture2e('env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh')
+
+      if result.include?('Current branch master is up to date')
+        puts '  - Oh My Zsh already up to date.'.colorize(:green)
+      else
+        puts '  - Updated Oh My Zsh...'.colorize(:green)
       end
+
       break_output
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dev_osx_updater
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Callum Barratt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.10'
 description: Keep your development tools such as homebrew, zsh, rubygems etc up to
   date with a simple informative script.
 email:
@@ -66,6 +80,7 @@ files:
 - lib/brew.rb
 - lib/dev_osx_updater/version.rb
 - lib/osx.rb
+- lib/pretzo.rb
 - lib/rbenv.rb
 - lib/ruby.rb
 - lib/rvm.rb