cinderella 0.2.15 → 0.3.0

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 .DS_Store
 Gemfile.lock
 *.gem
+vendor

data/bin/cinderella

@@ -10,7 +10,8 @@ ENV['EDITOR']   ||= 'vim'
 ENV['FULLNAME'] ||= 'Marlon Brando'
 
 config = {
-  :action => 'install'
+  :action   => 'install',
+  :unstable => false
 }
 
 optparse = OptionParser.new do |opts|
@@ -32,6 +33,10 @@ optparse = OptionParser.new do |opts|
   opts.on( '-v', '--version', 'Display the cinderella version' ) do
     config[:action] = 'version'
   end
+
+  opts.on( '-u', '--unstable', 'Build from homebrew master branch instead of a stable sha1' ) do
+    config[:unstable] = true
+  end
 end
 
 optparse.parse!
@@ -42,7 +47,11 @@ when 'uninstall'
 when 'version'
   Cinderella::Runner.version
 else
-  Cinderella::Runner.run
+  if config[:unstable]
+    Cinderella::Runner.run_unstable
+  else
+    Cinderella::Runner.run
+  end
 end
 
 # vim:ft=ruby

data/bootstrap.sh

@@ -12,8 +12,8 @@ fi
 
 which gem | grep -q rvm
 if [ $? -eq 0 ]; then
-  gem uninstall cinderella -aIx              >> ~/.cinderella/bootstrap.log 2>&1
-  gem install   cinderella --no-rdoc --no-ri >> ~/.cinderella/bootstrap.log 2>&1
+  gem uninstall cinderella -aIx                   >> ~/.cinderella/bootstrap.log 2>&1
+  gem install   cinderella --no-rdoc --no-ri      >> ~/.cinderella/bootstrap.log 2>&1
 else
   sudo gem uninstall cinderella -aIx              >> ~/.cinderella/bootstrap.log 2>&1
   sudo gem install   cinderella --no-rdoc --no-ri >> ~/.cinderella/bootstrap.log 2>&1
@@ -22,25 +22,16 @@ fi
 
 echo "Cinderella installed successfully"
 
-function run_cinderella {
-  hash -r
-  if [ -f ~/.cinderella.profile ]; then
-    source ~/.cinderella.profile
-  fi
-  cinderella
-  if [ "$?" -eq "0" ]; then
-    exit 0
-  fi
-}
+/usr/bin/cinderella
 
-# try cinderella three times just in case shit gets weird
-run_cinderella
-run_cinderella
-run_cinderella
+if [ "$?" -eq "0" ]; then
+  exit 0
+else
+  cat ~/.cinderella/bootstrap.log
+  echo ""
+  echo "Something went wrong with the install. :("
+  echo "Dump this log into a gist and link to me to it"
+  echo "http://github.com/atmos/cinderella/issues"
+  echo "Sorry it failed. :("
+fi
 
-cat ~/.cinderella/bootstrap.log
-echo ""
-echo "Something went wrong with the install. :("
-echo "Dump this log into a gist and link to me to it"
-echo "http://github.com/atmos/cinderella/issues"
-echo "Sorry it failed. :("

data/lib/cinderella.rb

@@ -14,6 +14,11 @@ module Cinderella
       new.run
     end
 
+    def self.run_unstable
+      ENV['CINDERELLA_RELEASE'] = 'origin/master'
+      run
+    end
+
     def self.uninstall
       new.uninstall
     end
@@ -72,7 +77,7 @@ module Cinderella
 
     def sketchy_ruby?
       case `which ruby`.chomp
-      when '/usr/bin/ruby', /#{ENV['HOME']}\/Developer/
+      when '/usr/bin/ruby', /#{ENV['HOME']}\/Developer/, /#{ENV['HOME']}\/\.rbenv/
         false
       else
         true

data/lib/cinderella/version.rb

@@ -1,3 +1,3 @@
 module Cinderella
-  VERSION = "0.2.15"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cinderella
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 15
-  version: 0.2.15
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +12:00
+date: 2011-08-26 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency