cinderella 0.2.5 → 0.2.6

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems/specification'
 require 'bundler'
 
 GEM         = "cinderella"
-GEM_VERSION = "0.2.5"
+GEM_VERSION = "0.2.6"
 AUTHOR      = "Corey Donohoe"
 EMAIL       = "atmos@atmos.org"
 HOMEPAGE    = "http://github.com/atmos/cinderella"

data/bin/cinderella

@@ -2,7 +2,6 @@
 require "rubygems"
 require "cinderella"
 require "optparse"
-require "etc"
 
 ENV['HOME']     ||= '/Users/bofh'
 ENV['USER']     ||= 'bofh'
@@ -10,43 +9,6 @@ ENV['EMAIL']    ||= 'noreply@gmail.com'
 ENV['EDITOR']   ||= 'vim'
 ENV['FULLNAME'] ||= 'Marlon Brando'
 
-RECOMMENDED_LLVM   = 2206
-MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp
-MACOS_VERSION      = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_f
-
-# stop people from running this as root
-if Etc.getpwuid.uid == 0
-  $stderr.puts "#{$0} should not be run as root, try again as a normal user"
-  exit 1
-end
-
-# let people know they're using a non-cinderella based rvm
-unless ENV['rvm_path'].nil? || ENV['rvm_path'] =~ /#{ENV['HOME']}\/Developer/
-  $stderr.puts "You have a pre-existing rvm install that might mess with installation"
-  $stderr.puts "You should take a look at https://github.com/atmos/cinderella/issues#issue/25"
-  $stderr.puts "I'm going to continue anyway, *fingers crossed* ;)"
-end
-
-# ensure we have a recent version of snow leopard/xcode
-if MACOS_VERSION >= 10.6
-  begin
-    xcode_path = `/usr/bin/xcode-select -print-path`.chomp
-    exit(1) if xcode_path.empty?
-    if `#{xcode_path}/usr/bin/llvm-gcc-4.2 -v 2>&1` =~ /LLVM build (\d{4,})/
-      if $1.to_i < RECOMMENDED_LLVM
-        $stderr.puts "You should really upgrade your xcode install"
-      end
-    end
-  rescue
-    $stderr.puts "You need xcode for this to work :\\"
-    exit(1)
-  end
-else
-  $stderr.puts "You should really upgrade to snow leopard"
-  $stderr.puts "Make sure you have xcode installed and cross your fingers"
-  $stderr.puts "I've seen it work on leopard though..."
-end
-
 Cider::Runner.run
 
 # vim:ft=ruby

data/lib/cinderella.rb

@@ -1,14 +1,40 @@
+require "etc"
 require "json"
 require "tmpdir"
 require "rest_client"
 
 module Cider
   class Runner
+    RECOMMENDED_LLVM   = 2206
+    MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp
+    MACOS_VERSION      = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_f
+
     def self.run
       new.run
     end
 
     def run
+      if root?
+        warn "#{$0} should not be run as root, try again as a normal user"
+        exit 1
+      end
+
+      unless sane_os_version?
+        warn "You should really upgrade to snow leopard"
+        warn "Make sure you have xcode installed and cross your fingers"
+        warn "I've seen it work on leopard though..."
+      end
+
+      unless sane_xcode_version?
+        $stderr.puts "You need xcode for this to work :\\"
+        exit(1)
+      end
+
+      if sketchy_ruby?
+        warn "You have a pre-existing ruby install that might mess with installation"
+        warn "I'm going to continue anyway, *fingers crossed* ;)"
+      end
+
       system("rm -rf ~/.cinderella")
       system("chef-solo -c #{config}")
       exit($?.to_i)
@@ -21,6 +47,39 @@ module Cider
 
     private
 
+    def sketchy_ruby?
+      case `which ruby`.chomp
+      when '/usr/bin/ruby', /#{ENV['HOME']}\/Developer/
+        false
+      else
+        true
+      end
+    end
+
+    def root?
+      Etc.getpwuid.uid == 0
+    end
+
+    def sane_os_version?
+      MACOS_VERSION >= 10.6
+    end
+
+    def sane_xcode_version?
+      xcode_path = `/usr/bin/xcode-select -print-path`.chomp
+      if xcode_path.empty?
+        false
+      elsif `#{xcode_path}/usr/bin/llvm-gcc-4.2 -v 2>&1` =~ /LLVM build (\d{4,})/
+        if $1.to_i < RECOMMENDED_LLVM
+          warn "You should really upgrade your xcode install"
+        end
+        true
+      end
+    end
+
+    def warn(msg)
+      $stderr.puts msg
+    end
+
     def download_solo_rb
       response = RestClient.get("http://ciderapp.org/solo.rb")
       if response.code == 200

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cinderella
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Corey Donohoe