greenhouse 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e392ae36dc3e9abf2e9cabffc067e27418633b31
-  data.tar.gz: 935734f05718a35a1e701c9ae7cd5c6535b80aff
+  metadata.gz: 46f9163d7afb19a3167ba11589fde5aa3ce2db83
+  data.tar.gz: b8669a7f66ffc5ccbaa4549daf7b432fc9ca3454
 SHA512:
-  metadata.gz: 6bb6c93fcb847fa5833c39a41d6452dd33572225aaf1ae33fd0f8a79d67e8720517435eaccec8f8ec0d240f8c65e509d5c0ed9aa5ed66ac18c4298db7c08bf07
-  data.tar.gz: 6647ec4bf8a6116c6363be50aed4890bc6f943c1659d50c13355c20c500f9bb4aeab1a4c62ec308ec146974237318849ffa0ea508783057cc0832fd8dcb82452
+  metadata.gz: a627df75f673da9436f78fee0f09ec6cc3d7220ef74a8a38309a058c8f49872aac1ab68dd5ffee93044bae503ce17e59a412359c5caf99fd2171a427754655f0
+  data.tar.gz: 719c6daafae8f253c9066d636052e942b925fa74b71ad7c59312a6b00c659acb5d98becaaa5f74993171acda3ff05400155a460a7c470e14dcaf50d1c1d664af

data/lib/greenhouse.rb

@@ -1,6 +1,7 @@
 require 'bundler'
 require 'rake'
 require 'active_support/inflector'
+require 'inkjet'
 require 'greenhouse/version'
 require 'greenhouse/resources'
 require 'greenhouse/projects'

data/lib/greenhouse/commands/add.rb

@@ -13,7 +13,7 @@ module Greenhouse
           #  Tasks::ProjectStatus.perform(project)
           #end
           Projects.projects.each do |project|
-            puts "    \e[36m#{project.title}\e[0m"
+            puts "    #{project.title.cyan}"
           end
           puts
           print "Would you like to add another project? ([y]es/[N]o): "

data/lib/greenhouse/commands/init.rb

@@ -48,7 +48,7 @@ IGNORE
       
       after_hook do
         puts
-        puts "New ecosystem initialized in \e[36m#{Projects::path}\e[0m"
+        puts "New ecosystem initialized in #{Projects::path.magenta}"
       end
 
       class << self
@@ -62,7 +62,7 @@ IGNORE
         while !['', 'n','no'].include?(another) do
           puts "The following projects will be initialized in your ecosystem:"
           Projects.projects.each do |project|
-            puts "    \e[36m#{project.title}\e[0m"
+            puts "    #{project.title.cyan}"
           end
           puts
           print "Would you like to add another project before initializing? ([y]es/[N]o): "

data/lib/greenhouse/commands/launch.rb

@@ -64,16 +64,16 @@ USAGE
                   require 'dotenv'
                   Dotenv.load!
                 rescue
-                  puts "\e[31mError parsing .env file for #{app.title}.\e[0m"
+                  puts "Error parsing .env file for #{app.title.cyan}.".red
                   exit 1
                 end
               else
-                puts "\e[33mWarning: No .env file found in #{app.title}!\e[0m"
+                puts "Warning: No .env file found in #{app.title.cyan}!".yellow
                 puts "Your application may not behave as expected without a .env file."
               end
               
               unless app.procfile.exists?
-                puts "\e[31mNo Procfile found for #{app.title}\e[0m"
+                puts "No Procfile found for #{app.title.cyan}".red
                 exit 1
               end
 

data/lib/greenhouse/commands/pull.rb

@@ -29,7 +29,7 @@ USAGE
 
       def pull_project(project)
         unless project.exists?
-          puts "Project \e[36m#{project.title}\e[0m does not exist. Try initializing it with `greenhouse init`"
+          puts "Project #{project.title.cyan} does not exist. Try initializing it with `greenhouse init`"
           return
         end
 

data/lib/greenhouse/commands/purge.rb

@@ -44,14 +44,13 @@ USAGE
             puts "Nothing to do."
             return
           end
-          #return unless force? || prompt
         
           purge
         else
           Tasks::PurgeProject.perform(app, force?)
         end
 
-        puts "\e[33mDone\e[0m"
+        puts "Done".yellow
         return
       end
 
@@ -62,29 +61,6 @@ USAGE
 
         Tasks::RemoveGreenhouseFiles.perform(force?) if purge_all?
       end
-  
-      def prompt
-        puts <<PUTS 
-\e[31mThis will completely clean out the ecosystem, removing all projects and 
-optionally dropping the database and wiping configuration files.\e[0m
-
-PUTS
-        puts <<PUTS
-You will be prompted if you have any uncommitted local changes or unpushed branches
-in any of your projects and may choose to either take action or skip that project
-to avoid losing any work.
-
-PUTS
-        puts <<PUTS
-You will be prompted separately to confirm whether you'd like to drop or keep your
-databases.
-PUTS
-
-        puts
-        print "Are you sure you want to continue? ([y]es/[N]o): "
-        continue = STDIN.gets.chomp.downcase
-        ["y","yes"].include?(continue)
-      end
     
     end
   end

data/lib/greenhouse/commands/push.rb

@@ -29,7 +29,7 @@ USAGE
 
       def push_project(project)
         unless project.exists?
-          puts "Project \e[36m#{project.title}\e[0m does not exist. Try initializing it with `greenhouse init`"
+          puts "Project #{project.title.cyan} does not exist. Try initializing it with `greenhouse init`"
           return
         end
 

data/lib/greenhouse/commands/status.rb

@@ -46,7 +46,6 @@ USAGE
         end
 
         Projects::send(project_type).each do |project|
-          puts
           Tasks::ProjectStatus.perform(project, with_git?)
         end
       end

data/lib/greenhouse/projects/repository.rb

@@ -74,6 +74,17 @@ module Greenhouse
         end
       end
 
+      def not_checked_out?
+        !not_checked_out.empty?
+      end
+
+      # Remote branches that aren't checked out locally
+      def not_checked_out
+        git.branches.remote.select do |branch|
+          !branch.full.match(/HEAD/) && !git.branches.local.map(&:name).include?(branch.full.split("/").last)
+        end
+      end
+
       # Check whether local branches are synced with the remotes
       def synced?
         unsynced.empty?
@@ -85,9 +96,13 @@ module Greenhouse
         git.branches.local.each do |branch|
           git.remotes.each do |remote|
             lcommit = git.object(branch.name).log.first
-            rcommit = git.object("#{remote.name}/#{branch.name}").log.first
-            next if lcommit.sha == rcommit.sha
-            branches << [branch, remote]
+            begin
+              rcommit = git.object("#{remote.name}/#{branch.name}").log.first
+              next if lcommit.sha == rcommit.sha
+              branches << [branch, remote]
+            rescue # can this just be an ensure? will the next still work without ensuring?
+              branches << [branch, remote]
+            end
           end
         end
         branches
@@ -102,11 +117,15 @@ module Greenhouse
       def ahead
         unsynced.select do |branch|
           lbranch = git.object(branch[0].name)
-          rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
-          lcommit = lbranch.log.first
-          rcommit = rbranch.log.first
+          begin
+            rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
+            lcommit = lbranch.log.first
+            rcommit = rbranch.log.first
           
-          !rbranch.log.map(&:sha).include?(lcommit.sha) && lbranch.log.map(&:sha).include?(rcommit.sha)
+            !rbranch.log.map(&:sha).include?(lcommit.sha) && lbranch.log.map(&:sha).include?(rcommit.sha)
+          rescue
+            true
+          end
           
           #lcommit.date <= rcommit.date
         end
@@ -121,11 +140,15 @@ module Greenhouse
       def behind
         unsynced.select do |branch|
           lbranch = git.object(branch[0].name)
-          rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
-          lcommit = lbranch.log.first
-          rcommit = rbranch.log.first
-          
-          rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha)
+          begin
+            rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
+            lcommit = lbranch.log.first
+            rcommit = rbranch.log.first
+            
+            rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha)
+          rescue
+            false
+          end
           
           #lcommit.date >= rcommit.date
         end
@@ -138,11 +161,15 @@ module Greenhouse
       def diverged
         unsynced.select do |branch|
           lbranch = git.object(branch[0].name)
-          rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
-          lcommit = lbranch.log.first
-          rcommit = rbranch.log.first
+          begin
+            rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
+            lcommit = lbranch.log.first
+            rcommit = rbranch.log.first
           
-          !rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha)
+            !rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha)
+          rescue
+            false
+          end
         end
       end
 
@@ -157,12 +184,16 @@ module Greenhouse
       def out_of_sync
         unsynced.select do |branch|
           lbranch = git.object(branch[0].name)
-          rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
-          lcommit = lbranch.log.first
-          rcommit = rbranch.log.first
+          begin
+            rbranch = git.object("#{branch[1].name}/#{branch[0].name}")
+            lcommit = lbranch.log.first
+            rcommit = rbranch.log.first
           
-          (rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha)) ||
-          (!rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha))
+            (rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha)) ||
+            (!rbranch.log.map(&:sha).include?(lcommit.sha) && !lbranch.log.map(&:sha).include?(rcommit.sha))
+          rescue
+            true
+          end
         end
       end
 

data/lib/greenhouse/tasks/add_project.rb

@@ -11,7 +11,7 @@ module Greenhouse
         project = Projects::Project.new(remote.match(/([^\/]*)\.git/)[1], {remote: remote})
         
         if Projects::projects_file.projects.keys.include?(project.name) || Projects::projects_file.projects.values.map { |p| p['git'].downcase }.include?(project.repository.remote.downcase)
-          puts "\e[31mCannot add project. Another project with the same name already exists.\e[0m"
+          puts "Cannot add project. Another project with the same name already exists.".red
           # TODO prompt to replace it?
           # would need to probably remove the project, remove procs from procfile, resync project, reconfig, etc.
           return
@@ -42,7 +42,7 @@ module Greenhouse
         
         Projects::projects_file.write
 
-        puts "Added \e[36m#{project.title}\e[0m to the ecosystem."
+        puts "Added #{project.title.cyan} to the ecosystem."
         project
       end
 

data/lib/greenhouse/tasks/project_status.rb

@@ -6,28 +6,35 @@ module Greenhouse
 
       def perform(project, verbose=false)
         @project = project
-        
         @project.repository.fetch if verbose && @project.exists?
 
-        puts "  \e[36m#{@project.title}\e[0m (#{@project.type.capitalize})"
-        puts "    #{@project.repository.remote}"
-        puts "    #{@project.exists? ? "\e[32mInitialized" : "\e[33mNot Initialized"}\e[0m"
-        puts "    #{@project.configured? ? "\e[32mConfigured" : "\e[33mNot Configured"}\e[0m" if @project.exists? && @project.is_a?(::Greenhouse::Projects::Application)
-
-        if @project.exists?
-          if !verbose
-            puts "    \e[33mUncommitted Changes\e[0m" if @project.repository.changes?
-            puts "    \e[33mUnpushed Branches\e[0m" if @project.repository.ahead?
-            puts "    \e[33mUnpulled Branches\e[0m" if @project.repository.behind?
-            puts "    \e[33mDiverged Branches\e[0m" if @project.repository.diverged?
+        Inkjet.indent do
+          print "#{@project.title.cyan} (#{@project.type.capitalize})"
+          undent do
+            #puts "#{@project.repository.remote}"
+            print " #{@project.exists? ? "Initialized".green : "Not Initialized".yellow}"
+            print ", #{@project.configured? ? "Configured".green : "Not Configured".yellow}" if @project.exists? && @project.is_a?(::Greenhouse::Projects::Application)
           end
 
-          if !@project.repository.changes? && !@project.repository.ahead? && @project.repository.up_to_date?
-            puts "    \e[32mUp-to-date\e[0m"
-          elsif verbose
-            print_local_changes(4) if @project.repository.changes?
-            print_unpushed_branches(4) if @project.repository.ahead?
-            print_out_of_sync_branches(4) if @project.repository.out_of_sync?
+          if @project.exists?
+            undent do
+              print ", "+"Uncommitted Changes".red if @project.repository.changes?
+              print ", "+"Unpushed Branches".blue if @project.repository.ahead?
+              print ", "+"Unpulled Branches".yellow if @project.repository.behind?
+              print ", "+"Diverged Branches".magenta if @project.repository.diverged?
+              print ", "+"Up-to-date".green if !@project.repository.changes? && !@project.repository.ahead? && @project.repository.up_to_date?
+            end
+            
+            puts
+
+            if verbose
+              Inkjet.indent do
+                print_local_changes if @project.repository.changes?
+                print_unpushed_branches if @project.repository.ahead?
+                print_out_of_sync_branches if @project.repository.out_of_sync?
+                print_not_checked_out_branches if @project.repository.not_checked_out?
+              end
+            end
           end
         end
 

data/lib/greenhouse/tasks/project_task.rb

@@ -15,11 +15,12 @@ module Greenhouse
         end
 
         def bundle(cmd='install')
-          puts "Running Bundler for \e[36m#{@project.title}\e[0m..."
+          puts "Running Bundler for #{@project.title.cyan}..."
+          raise "hi"
           @project.bundle(cmd)
           true
         rescue Exception => e
-          puts "\e[31mError running Bundler for #{@project.title}\e[0m"
+          puts "Error running Bundler for #{@project.title.cyan}".red
           puts "#{e.class.name}: #{e.message}"
           puts e.backtrace
           # TODO? prompt to continue?
@@ -27,7 +28,7 @@ module Greenhouse
         end
 
         def clone
-          puts "Cloning \e[36m#{@project.title}\e[0m (#{@project.repository.remote}) into #{@project.path}..."
+          puts "Cloning #{@project.title.cyan} (#{@project.repository.remote}) into #{@project.path}..."
           @project.repository.clone
             
           # Ignore the project's ignored files
@@ -38,7 +39,7 @@ module Greenhouse
           end
           true
         rescue Exception => e
-          puts "\e[31mCould not clone #{@project.title}\e[0m"
+          puts "Could not clone #{@project.title.cyan}".red
           puts "#{e.class.name}: #{e.message}"
           puts e.backtrace
           # TODO? prompt to continue?
@@ -46,7 +47,7 @@ module Greenhouse
         end
 
         def pull
-          print "Checking \e[36m#{@project.title}\e[0m git remotes for upstream commits... "
+          print "Checking #{@project.title.cyan} git remotes for upstream commits... "
           
           @project.repository.fetch # fetch the latest from remotes
           if @project.repository.out_of_sync?
@@ -63,7 +64,7 @@ module Greenhouse
             merge = nil
             stashed = false
             if @project.repository.changes?(false)
-              puts "\e[33mYou have uncommitted local changes in #{@project.path} on branch #{@project.repository.git.branch.name}\e[0m"
+              puts "You have uncommitted local changes in #{@project.path.cyan} on branch #{@project.repository.git.branch.name.white}".yellow
               while !['y','yes','n','no'].include?(merge) do
                 print "Would you like to stash your changes and merge the latest commits from upstream? ([y]es/[n]o): "
                 merge = STDIN.gets.chomp.downcase
@@ -122,58 +123,78 @@ module Greenhouse
               return
             else
               begin
-                raise "Cound not push local branches" unless push_branches
-              rescue
-                puts "\e[33mThere was a problem pushing local branches for #{@project.title}\e[0m"
+                #raise "Cound not push local branches" unless push_branches
+                push_branches
+              rescue Exception => e
+                puts e.message
+                puts e.backtrace
+                puts "There was a problem pushing local branches for #{@project.title.cyan}".yellow
                 puts "You may manually resolve conflicts in #{@project.path} and try again."
-                puts "\e[33mSkipping #{@project.title}...\e[0m"
+                puts "Skipping #{@project.title.cyan}...".yellow
                 return
               end
             end
             
             return true
           else
-            puts "Nothing to push for \e[36m#{@project.title}\e[0m."
+            puts "Nothing to push for #{@project.title.cyan}"
           end
         end
 
-        # TODO move this to a logger class
-        def indent_spaces(indent=0)
-          indent.times.map {" "}.join
-        end
-
-        def print_local_changes(indent=0)
-          puts "#{indent_spaces indent}\e[33mYou have uncommitted changes in #{@project.title}!\e[0m"
-          puts "#{indent_spaces indent}The following files have uncommitted local modifications:"
+        def print_local_changes
           puts
-          @project.repository.changes.each do |name,file|
-            print "#{indent_spaces indent}#{file.untracked ? "U" : file.type}"
-            puts "   #{@project.path}/#{name}"
+          puts "You have uncommitted changes in #{@project.title.cyan}!".red
+          puts
+          Inkjet.indent do
+            @project.repository.changes.each do |name,file|
+              puts "#{file.untracked ? "U" : file.type}    #{@project.path}/#{name}"
+            end
           end
           puts
         end
 
-        def print_unpushed_branches(indent=0)
-          puts "#{indent_spaces indent}\e[33mYou have branches in #{@project.title} that haven't been pushed!\e[0m"
+        def print_unpushed_branches
           puts
-          @project.repository.ahead.each do |branch|
-            puts "#{indent_spaces indent}    branch #{branch[0].name} is ahead of #{branch[1].name}/#{branch[0].name}"
-          end
-          @project.repository.diverged.each do |branch|
-            puts "#{indent_spaces indent}    branch #{branch[0].name} and #{branch[1].name}/#{branch[0].name} have diverged"
+          puts "You have branches in #{@project.title.cyan} that haven't been pushed!".blue
+          puts
+          Inkjet.indent do
+            @project.repository.ahead.each do |branch|
+              begin
+                rbranch = @project.repository.git.object("#{branch[1].name}/#{branch[0].name}")
+                puts "branch #{branch[0].name.bold} is #{"ahead".cyan} of #{branch[1].name.bold}/#{rbranch.name.bold}"
+              rescue Exception => e
+                puts "branch #{branch[0].name.bold} #{"does not exist".blue} on remote #{branch[1].name.bold}"
+              end
+            end
+            @project.repository.diverged.each do |branch|
+              puts "branch #{branch[0].name.bold} and #{branch[1].name.bold}/#{branch[0].name.bold} have #{"diverged".magenta}"
+            end
           end
           puts
         end
 
-        def print_out_of_sync_branches(indent=0)
-          puts "#{indent_spaces indent}\e[33mYou have out of sync branches in #{@project.title}\e[0m"
+        def print_out_of_sync_branches
+          puts
+          puts "You have out of sync branches in #{@project.title.cyan}".yellow
           puts
-          @project.repository.behind.each do |branch|
-            puts "#{indent_spaces indent}    \e[37mbranch\e[0m #{branch[0].name} \e[37mis behind\e[0m #{branch[1].name}/#{branch[0].name}"
+          Inkjet.indent do
+            @project.repository.behind.each do |branch|
+              puts "branch #{branch[0].name.bold} is #{"behind".yellow} #{branch[1].name.bold}/#{branch[0].name.bold}"
+            end
+
+            @project.repository.diverged.each do |branch|
+              puts "branch #{branch[0].name.bold} and #{branch[1].name}/#{branch[0].name.bold} have #{"diverged".magenta}"
+            end
           end
+          puts
+        end
 
-          @project.repository.diverged.each do |branch|
-            puts "#{indent_spaces indent}    \e[37mbranch\e[0m #{branch[0].name} \e[37mand\e[0m #{branch[1].name}/#{branch[0].name} \e[37mhave diverged\e[0m"
+        def print_not_checked_out_branches
+          puts
+          puts "The following branches are available to be checked out locally:".green
+          puts
+          @project.repository.not_checked_out.each do |branch|
+            puts "branch #{branch.full.split("/").last.bold} is #{"available".green} from #{branch.full.split("/")[1].bold}".indent
           end
           puts
         end
@@ -271,14 +292,20 @@ module Greenhouse
         def push_branches
           @project.repository.out_of_sync.each do |branch|
             begin
-              print "Attempting to merge #{branch[1].name}/#{branch[0].name} into #{branch[0].name} before pushing..."
-              @project.repository.git.checkout(branch[0].name)
-              @project.repository.git.merge("#{branch[1].name}/#{branch[0].name}")
-              puts "\e[32mSuccess.\e[0m"
+              # skip the merge if there's no remote branch
+              # TODO maybe check remote branches instead, or even better check for remote branch changes
+              rbranch = @project.repository.git.object("#{branch[1].name}/#{branch[0].name}")
+              begin
+                print "Attempting to merge #{branch[1].name}/#{branch[0].name} into #{branch[0].name} before pushing..."
+                @project.repository.git.checkout(branch[0].name)
+                @project.repository.git.merge("#{branch[1].name}/#{branch[0].name}")
+                puts "Success.".green
+              rescue
+                # TODO detect unmerged files, allow to resolve inline?
+                puts "Failed! Unresolved conflicts.".red
+                return false
+              end
             rescue
-              # TODO detect unmerged files, allow to resolve inline?
-              puts "\e[31mFailed! Unresolved conflicts.\e[0m"
-              return false
             end
           end
 
@@ -286,7 +313,7 @@ module Greenhouse
           @project.repository.branches.local.each do |branch|
             @project.repository.push('origin', branch.name)
           end
-          puts "\e[32mSuccess.\e[0m"
+          puts "Success.".green
           return true
         end
 
@@ -308,14 +335,14 @@ module Greenhouse
               end
 
               if %w(s skip).include?(commit)
-                puts "\e[33mSkipping #{@project.title}...\e[0m"
+                puts "Skipping #{@project.title.cyan}...".yellow
                 return
               elsif %w(c commit).include?(commit)
                 begin
                   raise "Could not commit local changes" unless commit_changes
                 rescue
-                  puts "\e[33mThere was a problem committing local changes to #{@project.title}\e[0m"
-                  puts "\e[33mSkipping #{@project.title}...\e[0m"
+                  puts "There was a problem committing local changes to #{@project.title.cyan}".red
+                  puts "Skipping #{@project.title.cyan}...".yellow
                   return
                 end
               end
@@ -333,15 +360,15 @@ module Greenhouse
               end
 
               if %w(s skip).include?(push)
-                puts "\e[33mSkipping #{@project.title}...\e[0m"
+                puts "Skipping #{@project.title.cyan}...".yellow
                 return
               elsif %w(p push).include?(push)
                 begin
                   raise "Cound not push local branches" unless push_branches
                 rescue
-                  puts "\e[33mThere was a problem pushing local branches for #{@project.title}\e[0m"
+                  puts "There was a problem pushing local branches for #{@project.title.cyan}".yellow
                   puts "You may manually resolve conflicts in #{@project.path} and try again."
-                  puts "\e[33mSkipping #{@project.title}...\e[0m"
+                  puts "Skipping #{@project.title.cyan}...".yellow
                   return
                 end
               end
@@ -349,7 +376,7 @@ module Greenhouse
           
           end
           
-          puts "\e[33mRemoving #{@project.title} project directory...\e[0m"
+          puts "Removing #{@project.title.cyan} project directory...".yellow
 
           Projects::procfile.processes.delete_if do |key,process|
             # this is sort of generic, just checks for the project name in the key/cmd

data/lib/greenhouse/tasks/remove_greenhouse_files.rb

@@ -12,7 +12,7 @@ module Greenhouse
           end
 
           if ['r','remove'].include?(remove) || force
-            puts "\e[33mRemoving default config file...\e[0m"
+            puts "Removing default config file...".yellow
             Projects::dotenv.unlink
           end
         end
@@ -24,7 +24,7 @@ module Greenhouse
           end
 
           if ['r','remove'].include?(remove) || force
-            puts "\e[33mRemoving .projects file...\e[0m"
+            puts "Removing .projects file...".yellow
             Projects::projects_file.unlink
           end
         end
@@ -36,7 +36,7 @@ module Greenhouse
           end
 
           if ['r','remove'].include?(remove) || force
-            puts "\e[33mRemoving .ignore file...\e[0m"
+            puts "Removing .ignore file...".yellow
             Projects::ignore_file.unlink
           end
         end
@@ -48,7 +48,7 @@ module Greenhouse
           end
 
           if ['r','remove'].include?(remove) || force
-            puts "\e[33mRemoving Procfile...\e[0m"
+            puts "Removing Procfile...".yellow
             Projects::procfile.unlink
           end
         end

data/lib/greenhouse/tasks/remove_project.rb

@@ -6,7 +6,7 @@ module Greenhouse
 
       def perform(project)
         @project = project
-        puts "\e[33mRemoving #{@project.title} from your .projects file...\e[0m"
+        puts "Removing #{@project.title} from your .projects file...".yellow
         Projects::projects_file.projects.delete_if { |name,project| name == @project.name }
         Projects::projects_file.write
       end

data/lib/greenhouse/version.rb

@@ -1,8 +1,14 @@
 module Greenhouse
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end
 
 __END__
+0.0.8:
+* Fix for git failures when remote branches don't yet exist
+* Printing untracked remote branches in status
+* Cleaned up the status command printouts overall to make them more compact and easier to read
+* Utilizing inkjet gem for formatting, colors and indentation
+
 0.0.7:
 * Simple bundler command to run install/update for a single or all projects
 * Refactor `status` command, renamed --verbose flag to --git, only fetching git remotes with --git flag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhouse
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inkjet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement