greenhouse 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb09c160cfae667639e3d36d4ac008e47dcbd7fd
-  data.tar.gz: a20696bc130d382de9b591e2336f34f5f943d667
+  metadata.gz: e392ae36dc3e9abf2e9cabffc067e27418633b31
+  data.tar.gz: 935734f05718a35a1e701c9ae7cd5c6535b80aff
 SHA512:
-  metadata.gz: 04f751c5e720212da0918a2868bbc727083295bb96e61eb8613d3ecec9c8c133567a9cf4f2b80fe05b9072f032993f74e8ef7652bb3dcda9709445c5eb425dea
-  data.tar.gz: 0bccfedd895e135bce4ecd184349b6275d9f0f0e33b932177e67336d706e1d2c774fd8eb67c73c61421ab026cebd553cfda7ce8db10a2c4c86af91e1b8868fcb
+  metadata.gz: 6bb6c93fcb847fa5833c39a41d6452dd33572225aaf1ae33fd0f8a79d67e8720517435eaccec8f8ec0d240f8c65e509d5c0ed9aa5ed66ac18c4298db7c08bf07
+  data.tar.gz: 6647ec4bf8a6116c6363be50aed4890bc6f943c1659d50c13355c20c500f9bb4aeab1a4c62ec308ec146974237318849ffa0ea508783057cc0832fd8dcb82452

data/lib/greenhouse/cli.rb

@@ -2,19 +2,10 @@ module Greenhouse
   class CLI
     include Scripts::Script
 
-    valid_arguments("-v")
+    valid_argument Scripts::Argument.new("-v, --verbose", :valid => [], :summary => "Output additional information from command executions to STDOUT")
 
-    def self.verbose
-      @verbose || false
-    end
-    
     def self.verbose?
-      verbose == true
-    end
-
-    def self.verbose=(v)
-      @verbose = v
-      @verbose
+      user_arguments.map(&:key).include?("-v")
     end
 
     def self.exec(cmd)
@@ -25,13 +16,13 @@ module Greenhouse
       end
     end
     
-    def self.arguments(*args)
+    def self.add_arguments(*args)
       keep = []
       args.each_with_index do |arg,a|
         if Commands::exists?(arg)
           begin
             @command = Commands::command(arg)
-            @command.arguments(*args.slice(a+1,args.length-a))
+            @command.set_arguments(*args.slice(a+1,args.length-a))
           rescue Scripts::InvalidArgument => e
             puts e.message
             Commands::command(arg).usage
@@ -39,6 +30,7 @@ module Greenhouse
           end
           break
         end
+
         keep << arg
       end
       super(*keep)
@@ -67,14 +59,18 @@ module Greenhouse
     def self.usage
       puts <<USAGE
 #{binary} v#{version} 
+
 usage: #{binary} #{valid_arguments.to_s} <command> [<args>]
-        
+
+Arguments:
+#{valid_arguments.to_help}
+
 The available greenhouse commands are:
 USAGE
 
       Commands::commands.each do |cmd|
         print "   %-#{Commands::commands.sort { |a,b| a.command_name.length <=> b.command_name.length }.last.command_name.length + 2}s" % cmd.command_name
-        puts cmd.command_summary
+        puts "# #{cmd.command_summary}"
       end
 
       puts
@@ -82,12 +78,19 @@ USAGE
     end
     
     def self.start
-      arguments(*ARGV)
-      verbose = arguments.map(&:key).include?("-v")
-      
+      begin
+        set_arguments(*ARGV)
+      rescue Scripts::InvalidArgument => e
+        puts e.message
+        return
+      rescue Exception => e
+        usage
+        return
+      end
+
       if @command.nil?
         usage
-        exit 1
+        return
       end
 
       @command.run

data/lib/greenhouse/commands.rb

@@ -28,6 +28,8 @@ require 'greenhouse/commands/console'
 require 'greenhouse/commands/push'
 require 'greenhouse/commands/pull'
 require 'greenhouse/commands/sync'
+require 'greenhouse/commands/bundle'
+require 'greenhouse/commands/specs'
 require 'greenhouse/commands/purge'
 require 'greenhouse/commands/remove'
 require 'greenhouse/commands/help'

data/lib/greenhouse/commands/bundle.rb

@@ -0,0 +1,46 @@
+module Greenhouse
+  module Commands
+    class Bundle
+      include Command
+      command_summary "Run bundler for one or all of your projects"
+      valid_arguments Scripts::Argument.new("install", summary: "Install the gems specified by the Gemfile or Gemfile.lock"), Scripts::Argument.new("update", summary: "Update dependencies to their latest versions")
+      project_arguments *Projects::projects.map(&:to_arg)
+      
+      class << self
+        def usage
+          puts <<USAGE
+usage: #{::Greenhouse::CLI.command_name} #{command_name} <#{valid_arguments.map(&:key).join(", ")}> [<project>]
+
+Arguments:
+#{valid_arguments.to_help}
+
+Projects:
+#{project_arguments.to_help}
+USAGE
+        end
+      end
+
+      def bundle_all(cmd)
+        Projects::projects.each do |project|
+          Tasks::BundleProject.perform(project, cmd)
+        end
+      end
+
+      def bundle_project(project, cmd)
+        Tasks::BundleProject.perform(project, cmd)
+      end
+
+      def run
+        cmd = arguments.select { |arg| valid_arguments.map(&:key).include?(arg.key) }.first
+        if cmd.nil?
+          puts "Please specify a bundle command."
+          usage
+          return
+        end
+
+        project = Projects::projects.select { |project| arguments.map(&:key).include?(project.name) }.first
+        project.nil? ? bundle_all(cmd) : bundle_project(project, cmd)
+      end
+    end
+  end
+end

data/lib/greenhouse/commands/command.rb

@@ -20,6 +20,7 @@ module Greenhouse
           @command_summary = summary unless summary.nil?
           @command_summary
         end
+        alias_method :summary, :command_summary
 
         def usage
           puts "usage: #{::Greenhouse::CLI.command_name} #{command_name} #{valid_arguments.to_s}"
@@ -34,7 +35,7 @@ module Greenhouse
           rescue Exception => e
             puts e.message
             @command.usage if e.is_a?(Scripts::InvalidArgument)
-            exit 1
+            return
           end
         end
 

data/lib/greenhouse/commands/specs.rb

@@ -0,0 +1,13 @@
+module Greenhouse
+  module Commands
+    class Specs
+      include Command
+      command_summary "Not Yet Implemented"
+      
+      def run
+        puts "Not Yet Implemented"
+      end
+
+    end
+  end
+end

data/lib/greenhouse/commands/status.rb

@@ -2,13 +2,17 @@ module Greenhouse
   module Commands
     class Status
       include Command
-      command_summary "List projects and their current status"
-      valid_arguments Scripts::Argument.new("-v, --verbose", :summary => "Print out detailed information about project status (local changes, ahead/behind/diverged branches, etc.)")
+      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("--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")
+      # TODO move engine to ForthRail
+      #valid_argument Scripts::Argument.new("--engine", :summary => "Print status for the Forth Rail Engine")
       project_arguments *Projects::projects.map(&:to_arg)
       
-      class << self
-        def usage
-          puts <<USAGE
+      def self.usage
+        puts <<USAGE
 usage: #{::Greenhouse::CLI.command_name} #{command_name} [<project>] #{valid_arguments.to_s}
 
 Arguments:
@@ -17,33 +21,38 @@ Arguments:
 Projects:
 #{project_arguments.to_help}
 USAGE
-        end
       end
 
-      def verbose
-        arguments.map(&:key).include?("-v")
+      def run
+        project.nil? ? ecosystem_status : project_status
+      end
+
+      def project
+        Projects::projects.select { |project| arguments.map(&:key).include?(project.name) }.first
+      end
+
+      def with_git?
+        arguments.map(&:key).include?("-g")
+      end
+
+      def project_type
+        arguments.map(&:key).include?("--apps") ? 'applications' : (arguments.map(&:key).include?("--gems") ? 'gems' : 'projects')
       end
       
       def ecosystem_status
-        if Projects::projects.empty?
-          puts "No projects configured."
+        if Projects::send(project_type).empty?
+          puts "No #{project_type} in your ecosystem."
           return
         end
 
-        puts "The following projects are configured in your ecosystem: "
-        Projects::projects.each do |project|
+        Projects::send(project_type).each do |project|
           puts
-          Tasks::ProjectStatus.perform(project, verbose)
+          Tasks::ProjectStatus.perform(project, with_git?)
         end
       end
 
-      def project_status(project)
-        Tasks::ProjectStatus.perform(project, verbose)
-      end
-
-      def run
-        project = Projects::projects.select { |project| arguments.map(&:key).include?(project.name) }.first
-        project.nil? ? ecosystem_status : project_status(project)
+      def project_status
+        Tasks::ProjectStatus.perform(project, with_git?)
       end
     end
   end

data/lib/greenhouse/scripts/argument.rb

@@ -25,7 +25,7 @@ module Greenhouse
 
         if args.length > 0 && args[0].is_a?(Hash)
           opts = args.slice!(0)
-          @valid = (opts[:valid].is_a?(Array) ? opts[:valid].map(&:to_s) : opts[:valid].to_s) if opts.has_key?(:valid)
+          @valid = (opts[:valid].is_a?(Array) ? opts[:valid].map(&:to_s) : [opts[:valid].to_s]) if opts.has_key?(:valid)
           @summary = opts[:summary] if opts.has_key?(:summary)
         end
         

data/lib/greenhouse/scripts/script.rb

@@ -12,12 +12,11 @@ module Greenhouse
         
         def run
           @script ||= new
-          raise "You have not defined a `run` method for your script." unless @script.respond_to?(:run)
+          raise "You must define a `run` method for your script." unless @script.respond_to?(:run)
           @script.run
         end
 
         def validate_arguments(val=nil)
-          return validate_arguments? if val.nil?
           @validate_arguments = val
         end
 
@@ -49,51 +48,73 @@ module Greenhouse
         end
         
         def project_argument(proj)
-          @valid_projs ||= Arguments.new
+          @valid_projects ||= Arguments.new
           if proj.is_a?(Argument)
-            @valid_projs << proj
+            @valid_projects << proj
           elsif proj.is_a?(Hash)
-            @valid_projs << Argument.new(proj.keys.first.to_s, proj.values.first)
+            @valid_projects << Argument.new(proj.keys.first.to_s, proj.values.first)
           elsif proj.is_a?(Array)
-            @valid_projs << Argument.new(proj[0].to_s, (proj.length > 1 ? proj[1] : []))
+            @valid_projects << Argument.new(proj[0].to_s, (proj.length > 1 ? proj[1] : []))
           else
-            @valid_projs << Argument.new(proj.to_s)
+            @valid_projects << Argument.new(proj.to_s)
           end
-          @valid_projs.last
+          @valid_projects.last
         end
 
         def project_arguments(*projs)
-          @valid_projs ||= Arguments.new
-          return @valid_projs if projs.empty?
+          @valid_projects ||= Arguments.new
+          return @valid_projects if projs.empty?
           
           projs.each { |proj| project_argument(proj) }
-          @valid_projs
+          @valid_projects
         end
 
         def arguments(*args)
-          @arguments ||= nil
-          return @arguments unless @arguments.nil?
+          add_arguments(*args)
+        end
+
+        def user_arguments
+          arguments
+        end
+
+        def set_arguments(*args)
           @arguments = Arguments.new
+          add_arguments(*args)
+        end
+
+        def add_arguments(*args)
+          @arguments ||= Arguments.new
           args.each_with_index do |arg,a|
-            argarr = arg.split("=")
-            argkey = argarr.slice!(0)
+            argk, argv = *parse_arg(arg)
             
-            if !valid_arguments.clone.concat(project_arguments).map(&:keys).any? { |keys| keys.include?(argkey) } && !arg.match(/\A(-)+[a-z0-9\-]=?.*\Z/i) && (a > 0 && args[a-1].match(/\A(-)+[a-z0-9\-]=?.*\Z/i)) && !@arguments.empty?
+            if !argument_flag?(arg) && !valid_argument?(argk) && (a > 0 && argument_flag?(args[a-1]))
               @arguments.last.value = arg
               next
             end
 
-            if validate_arguments?
-              raise InvalidArgument, "Invalid Argument: #{arg}" unless valid_arguments.clone.concat(project_arguments).map(&:keys).any? { |keys| keys.include?(argkey) }
-              @arguments << valid_arguments.clone.concat(project_arguments).select { |varg| varg.keys.include?(argkey) }.first
-            else
-              valid_arg = valid_arguments.clone.concat(project_arguments).select { |varg| varg.keys.include?(argkey) }.first
-              @arguments << (valid_arg || Argument.new(argkey))
-            end
-            @arguments.last.value = argarr.join("=") unless argarr.empty?
+            raise InvalidArgument, "Invalid Argument: #{arg}" if validate_arguments? && !valid_argument?(argk)
+            @arguments << argument_object(argk)
+            @arguments.last.value = argv unless argv.empty?
           end
           @arguments
         end
+
+        def parse_arg(arg)
+          arga = arg.split("=")
+          [arga.slice!(0), arga.join("=")]
+        end
+        
+        def valid_argument?(key)
+          valid_arguments.clone.concat(project_arguments).map(&:keys).flatten.include?(key)
+        end
+
+        def argument_flag?(arg)
+          arg.match(/\A(-)+[a-z0-9\-]=?.*\Z/i)
+        end
+
+        def argument_object(key)
+          valid_arguments.clone.concat(project_arguments).select { |varg| varg.keys.include?(key) }.first || Argument.new(key)
+        end
       end
 
       module InstanceMethods

data/lib/greenhouse/tasks.rb

@@ -14,6 +14,7 @@ require 'greenhouse/tasks/add_project'
 require 'greenhouse/tasks/push_project'
 require 'greenhouse/tasks/pull_project'
 require 'greenhouse/tasks/sync_project'
+require 'greenhouse/tasks/bundle_project'
 require 'greenhouse/tasks/purge_project'
 require 'greenhouse/tasks/remove_project'
 require 'greenhouse/tasks/generate_procfile'

data/lib/greenhouse/tasks/bundle_project.rb

@@ -0,0 +1,13 @@
+module Greenhouse
+  module Tasks
+    class BundleProject
+      include Task
+      include ProjectTask
+        
+      def perform(project, cmd='install')
+        @project = project
+        bundle(cmd)
+      end
+    end
+  end
+end

data/lib/greenhouse/tasks/project_status.rb

@@ -7,7 +7,7 @@ module Greenhouse
       def perform(project, verbose=false)
         @project = project
         
-        @project.repository.fetch if @project.exists?
+        @project.repository.fetch if verbose && @project.exists?
 
         puts "  \e[36m#{@project.title}\e[0m (#{@project.type.capitalize})"
         puts "    #{@project.repository.remote}"

data/lib/greenhouse/tasks/project_task.rb

@@ -14,9 +14,9 @@ module Greenhouse
           base.send :alias_method, :klone, :clone
         end
 
-        def bundle
+        def bundle(cmd='install')
           puts "Running Bundler for \e[36m#{@project.title}\e[0m..."
-          @project.bundle
+          @project.bundle(cmd)
           true
         rescue Exception => e
           puts "\e[31mError running Bundler for #{@project.title}\e[0m"

data/lib/greenhouse/tasks/task.rb

@@ -9,6 +9,10 @@ module Greenhouse
       end
 
       module ClassMethods
+        def self.extended(base)
+          base.send :attr_reader, :results
+        end
+
         def perform(*args)
           @task = new
           @task.before(*args) if @task.respond_to?(:before)
@@ -16,6 +20,10 @@ module Greenhouse
           @task.after(*args) if @task.respond_to?(:after)
           @task
         end
+
+        def results
+          (@task ||= new).results
+        end
       end
 
       module InstanceMethods

data/lib/greenhouse/version.rb

@@ -1,8 +1,14 @@
 module Greenhouse
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
 
 __END__
+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
+* Cleanup for script arguments
+* Dummy `specs` command as a placeholder to be overridden by extensions
+
 0.0.6:
 * Don't downcase git repos (duh)
 * Add console command to easily run rails console for rails apps

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhouse
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -107,6 +107,7 @@ files:
 - lib/greenhouse/tasks/sync_project.rb
 - lib/greenhouse/tasks/project_status.rb
 - lib/greenhouse/tasks/pull_project.rb
+- lib/greenhouse/tasks/bundle_project.rb
 - lib/greenhouse/tasks/task.rb
 - lib/greenhouse/tasks/push_project.rb
 - lib/greenhouse/tasks/remove_project.rb
@@ -128,10 +129,12 @@ files:
 - lib/greenhouse/commands/configure.rb
 - lib/greenhouse/commands/help.rb
 - lib/greenhouse/commands/init.rb
+- lib/greenhouse/commands/specs.rb
 - lib/greenhouse/commands/purge.rb
 - lib/greenhouse/commands/remove.rb
 - lib/greenhouse/commands/new.rb
 - lib/greenhouse/commands/status.rb
+- lib/greenhouse/commands/bundle.rb
 - lib/greenhouse/commands/sync.rb
 - lib/greenhouse/commands/console.rb
 - lib/greenhouse/commands/launch.rb
@@ -164,3 +167,4 @@ signing_key:
 specification_version: 4
 summary: Suite of tools for working on an entire 'ecosystem' of ruby gems and applications.
 test_files: []
+has_rdoc: