greenhouse 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70e837df0dc41ac4c7420f9d91fe280e76299325
-  data.tar.gz: cbb320ed8cd0d342c759c75d33d3afd0b097acea
+  metadata.gz: 229698788eac988d4fe2a4b0e02020c411ddd197
+  data.tar.gz: 1690b56ca25c361603b648dad3491a85b8e87b28
 SHA512:
-  metadata.gz: 37ba75f3252e4a8c61bd26cef97d1bf0663133c1c037b216c65c2e6670f46700163ef5d19ca3d2dd5d2beb01c61d7496e10fe383c18cba67eb100c33ec486a09
-  data.tar.gz: 328f1386ec44208f0478a52b266d99a2a0da28b6cbd8b6a4b68fff739e264479ab7d677c42451b08a1247b393775ebfca4de5903372d75a141439ba2f0d75fce
+  metadata.gz: 33ad676178e147a1584de6e462e939e7e9f78e725093a66c4dfb214110069eed444f84dc5e6d73fc0ae199069a309a2f18c1157bbeece1d1f62546a04e9d99ca
+  data.tar.gz: e15dcb381f91305271916b30ac01d8f4a375d46865f64112d372acff09ec1eedd614e1fd472895b91bc5aa7308e46129fa420823ffc6866d5c48253c4e125128

data/lib/greenhouse/commands/pull.rb

@@ -3,6 +3,7 @@ module Greenhouse
     class Pull
       include Command
       command_summary "Pull and merge remote branches for all projects"
+      valid_argument Scripts::Argument.new("-f, --force", :summary => "Pull and merge all projects without prompting")
       project_arguments *Projects::projects.map(&:to_arg)
       
       class << self
@@ -10,11 +11,18 @@ module Greenhouse
           puts <<USAGE
 usage: #{::Greenhouse::CLI.command_name} #{command_name} [<project>] #{valid_arguments.to_s}
 
+Arguments:
+#{valid_arguments.to_help}
+
 Projects:
 #{project_arguments.to_help}
 USAGE
         end
       end
+      
+      def force?
+        arguments.map(&:key).include?("-f")
+      end
 
       def pull_all
         if Projects.projects.empty?
@@ -23,7 +31,7 @@ USAGE
         end
 
         Projects.projects.each do |project|
-          Tasks::PullProject.perform(project)
+          Tasks::PullProject.perform(project, force?)
         end
       end
 
@@ -33,7 +41,7 @@ USAGE
           return
         end
 
-        Tasks::PullProject.perform(project)
+        Tasks::PullProject.perform(project, force?)
       end
 
       def run

data/lib/greenhouse/commands/push.rb

@@ -3,6 +3,7 @@ module Greenhouse
     class Push
       include Command
       command_summary "Push local branches for all projects to their git remotes"
+      valid_argument Scripts::Argument.new("-f, --force", :summary => "Push all branches without prompting")
       project_arguments *Projects::projects.map(&:to_arg)
       
       class << self
@@ -10,11 +11,18 @@ module Greenhouse
           puts <<USAGE
 usage: #{::Greenhouse::CLI.command_name} #{command_name} [<project>] #{valid_arguments.to_s}
 
+Arguments:
+#{valid_arguments.to_help}
+
 Projects:
 #{project_arguments.to_help}
 USAGE
         end
       end
+      
+      def force?
+        arguments.map(&:key).include?("-f")
+      end
 
       def push_all
         if Projects.projects.empty?
@@ -23,7 +31,7 @@ USAGE
         end
 
         Projects.projects.each do |project|
-          Tasks::PushProject.perform(project)
+          Tasks::PushProject.perform(project, force?)
         end
       end
 
@@ -33,7 +41,7 @@ USAGE
           return
         end
 
-        Tasks::PushProject.perform(project)
+        Tasks::PushProject.perform(project, force?)
       end
 
       def run

data/lib/greenhouse/commands/status.rb

@@ -3,7 +3,9 @@ module Greenhouse
     class Status
       include Command
       summary "List projects and their current status"
-      valid_argument Scripts::Argument.new("-g, --git", :summary => "Check git remotes and print out verbose information about project git status")
+      valid_argument Scripts::Argument.new("-g, --git", :summary => "Check git remotes to ensure you're status report is up-to-date on branch status, etc.")
+      valid_argument Scripts::Argument.new("-v, --verbose", :summary => "Print out verbose information about branch and commit status")
+      valid_argument Scripts::Argument.new("-r, --remote", :summary => "Include information about remote branches that are available to be checked out")
       valid_argument Scripts::Argument.new("--all", :summary => "Print status for all projects (default)")
       valid_argument Scripts::Argument.new("--apps", :summary => "Print status for all applications")
       valid_argument Scripts::Argument.new("--gems", :summary => "Print status for all gems")
@@ -34,6 +36,14 @@ USAGE
       def with_git?
         arguments.map(&:key).include?("-g")
       end
+      
+      def remote?
+        arguments.map(&:key).include?("-r")
+      end
+
+      def verbose?
+        arguments.map(&:key).include?("-v")
+      end
 
       def project_type
         arguments.map(&:key).include?("--apps") ? 'applications' : (arguments.map(&:key).include?("--gems") ? 'gems' : 'projects')
@@ -46,12 +56,12 @@ USAGE
         end
 
         Projects::send(project_type).each do |project|
-          Tasks::ProjectStatus.perform(project, with_git?)
+          Tasks::ProjectStatus.perform(project, with_git?, verbose?, remote?)
         end
       end
 
       def project_status
-        Tasks::ProjectStatus.perform(project, with_git?)
+        Tasks::ProjectStatus.perform(project, with_git?, verbose?, remote?)
       end
     end
   end

data/lib/greenhouse/commands/sync.rb

@@ -3,6 +3,7 @@ module Greenhouse
     class Sync
       include Command
       command_summary "Sync all projects with their git remotes"
+      valid_argument Scripts::Argument.new("-f, --force", :summary => "Pull and merge all projects without prompting")
       project_arguments *Projects::projects.map(&:to_arg)
       
       class << self
@@ -10,11 +11,18 @@ module Greenhouse
           puts <<USAGE
 usage: #{::Greenhouse::CLI.command_name} #{command_name} [<project>] #{valid_arguments.to_s}
 
+Arguments:
+#{valid_arguments.to_help}
+
 Projects:
 #{project_arguments.to_help}
 USAGE
         end
       end
+      
+      def force?
+        arguments.map(&:key).include?("-f")
+      end
 
       def sync_all
         if Projects.projects.empty?
@@ -23,13 +31,13 @@ USAGE
         end
 
         Projects.projects.each do |project|
-          Tasks::SyncProject.perform(project)
+          Tasks::SyncProject.perform(project, force?)
         end
         Tasks::GenerateProcfile.perform
       end
 
       def sync_project(project)
-        Tasks::SyncProject.perform(project)
+        Tasks::SyncProject.perform(project, force?)
         Tasks::GenerateProcfile.perform if project.type == 'application'
       end
 

data/lib/greenhouse/resources/dotenv_file.rb

@@ -49,8 +49,8 @@ module Greenhouse
       def write
         open("w") do |f|
           @config.each do |key,val|
-            next if val.nil? || val.empty?
-            f.write("#{key}=#{val}\n")
+            next if val.nil? || val.to_s.empty?
+            f.write("#{key}=#{val.to_s}\n")
           end
         end
       end

data/lib/greenhouse/tasks/project_status.rb

@@ -4,9 +4,9 @@ module Greenhouse
       include Task
       include ProjectTask
 
-      def perform(project, verbose=false)
+      def perform(project, fetch=false, verbose=false, remote=false)
         @project = project
-        @project.repository.fetch if verbose && @project.exists?
+        @project.repository.fetch if fetch && @project.exists?
 
         Inkjet.indent do
           print "#{@project.title.cyan} (#{@project.type.capitalize})"
@@ -26,15 +26,16 @@ module Greenhouse
             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
+
+            Inkjet.indent { print_not_checked_out_branches } if remote && @project.repository.not_checked_out?
           end
         end
 

data/lib/greenhouse/tasks/project_task.rb

@@ -43,7 +43,7 @@ module Greenhouse
           false
         end
 
-        def pull
+        def pull(force=false)
           print "Checking #{@project.title.cyan} git remotes for upstream commits... "
           
           @project.repository.fetch # fetch the latest from remotes
@@ -62,9 +62,14 @@ module Greenhouse
             stashed = false
             if @project.repository.changes?(false)
               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
+
+              if force
+                merge = 'yes'
+              else
+                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
+                end
               end
 
               if ['y','yes'].include?(merge)
@@ -73,9 +78,13 @@ module Greenhouse
                 @project.repository.stash
               end
             else
-              while !['y','yes','n','no'].include?(merge) do
-                print "Would you like to attempt to merge the latest commits from upstream? ([y]es/[n]o): "
-                merge = STDIN.gets.chomp.downcase
+              if force
+                merge = 'yes'
+              else
+                while !['y','yes','n','no'].include?(merge) do
+                  print "Would you like to attempt to merge the latest commits from upstream? ([y]es/[n]o): "
+                  merge = STDIN.gets.chomp.downcase
+                end
               end
             end
 
@@ -108,12 +117,16 @@ module Greenhouse
           end
         end
 
-        def push
+        def push(force=false)
           if @project.repository.ahead? || @project.repository.diverged?
             print_unpushed_branches
 
-            print "Would you like to push these branches now? ([P]ush/[s]kip): "
-            push = STDIN.gets.chomp.downcase
+            if force
+              push = 'push'
+            else
+              print "Would you like to push these branches now? ([P]ush/[s]kip): "
+              push = STDIN.gets.chomp.downcase
+            end
 
             if %w(s skip).include?(push)
               puts "Skipped #{@project.title}"
@@ -188,7 +201,7 @@ module Greenhouse
 
         def print_not_checked_out_branches
           puts
-          puts "The following branches are available to be checked out locally:".green
+          puts "The following branches are available in #{@project.title.cyan}:".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

data/lib/greenhouse/tasks/pull_project.rb

@@ -4,10 +4,10 @@ module Greenhouse
       include Task
       include ProjectTask
 
-      def perform(project)
+      def perform(project, force=false)
         @project = project
         
-        pull && bundle
+        pull(force) && bundle
       end
     end
   end

data/lib/greenhouse/tasks/push_project.rb

@@ -4,10 +4,10 @@ module Greenhouse
       include Task
       include ProjectTask
 
-      def perform(project)
+      def perform(project, force=false)
         @project = project
         
-        push
+        push force
       end
     end
   end

data/lib/greenhouse/tasks/sync_project.rb

@@ -4,12 +4,12 @@ module Greenhouse
       include Task
       include ProjectTask
 
-      def perform(project)
+      def perform(project, force=false)
         @project = project
 
         if @project.exists?
-          pull && bundle
-          push
+          pull(force) && bundle
+          push(force)
         else
           clone && bundle
         end

data/lib/greenhouse/version.rb

@@ -1,8 +1,13 @@
 module Greenhouse
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end
 
 __END__
+0.0.11:
+* --force flag for push/pull/sync commands
+* --verbose and --remote flag for status to control verbosity and printing remote branches
+* explicitly converting dotenv values to strings before checking or writing them
+
 0.0.10:
 * Adding a -d/--debug flag to output full backtraces
 * Not writing empty .env vars

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhouse
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler