geordi 1.2.3 → 1.3.0

data/lib/geordi/commands/capistrano.rb

@@ -8,10 +8,7 @@ def capistrano(*args)
 
   note 'Found the following deploy targets:'
   puts targets
-  puts
-
-  print 'Continue? [yN] '
-  exit unless $stdin.gets =~ /[yes]+/
+  prompt('Continue?', 'n', /y|yes/) or fail 'Cancelled.'
 
   targets << nil if targets.empty? # default target
   targets.each do |stage|

data/lib/geordi/commands/cucumber.rb

@@ -2,13 +2,19 @@ desc 'cucumber [FILES]', 'Run Cucumber features'
 long_desc <<-LONGDESC
 Example: `geordi cucumber features/authentication_feature:3`
 
-Runs Cucumber as you want: with `bundle exec`, `cucumber_spinner` detection,
-separate Firefox for Selenium, etc.
+Runs Cucumber as you want: with `bundle exec`, using parallel tests, with
+a VNC session holding Selenium test browsers, support for using a dedicated
+testing firefox and beta support for rerunning failed scenarios.
 
-Sometimes, the dot-printing Cucumber formatter does not show errors. In case a
-feature fails without a message, try calling with `--debug` or `-d`.
+- *@solo:* Generally, features are run in parallel. However, scenarios tagged
+with @solo are excluded and will be run sequentially, _after_ the parallel run.
 
-Any unknown option will be passed through to Cucumber, e.g. `--format pretty`.
+- *Debugging:* Sometimes, the dot-printing Cucumber formatter does not show
+errors. In case a feature fails without a message, try running it with `--debug`
+or `-d`.
+
+- *Options:* Any unknown option will be passed through to Cucumber,
+e.g. `--format pretty`.
 LONGDESC
 
 option :verbose, :aliases => '-v', :type => :boolean,
@@ -35,10 +41,17 @@ def cucumber(*files)
         fail 'Features failed.' if (i == options.rerun) # All reruns done?
 
         announce "Rerun ##{ i + 1 } of #{ options.rerun }"
-        break if Geordi::Cucumber.new.run(%w[--profile rerun], :verbose => options.verbose)
+        break if Geordi::Cucumber.new.run(%w[--profile rerun], :verbose => options.verbose, :parallel => false)
       end
     end
 
+    # Serial run of @solo scenarios
+    solo_tag_usages = `grep -r '@solo' features`.split("\n")
+    if solo_tag_usages.any?
+      announce 'Running @solo features'
+      Geordi::Cucumber.new.run %w[--tags @solo], :verbose => options.verbose, :parallel => false
+    end
+
   else
     note 'Cucumber not employed.'
   end

data/lib/geordi/commands/deploy.rb

@@ -5,13 +5,13 @@ Example: `geordi deploy production`
 Merge, push and deploy with a single command! There are several scenarios where
 this command comes in handy:
 
-1) Production deploy. From the master branch, run `geordi deploy production`.
+1) *Production deploy:* From the master branch, run `geordi deploy production`.
    This will merge `master` to `production`, push and deploy to production.
 
-2) Feature branch deploy. From the feature branch, run `geordi deploy staging`.
+2) *Feature branch deploy:* From the feature branch, run `geordi deploy staging`.
    This will merge the feature branch to `master`, push and deploy to staging.
 
-3) Simple deploy. If the source branch matches the target branch, merging will
+3) *Simple deploy:* If the source branch matches the target branch, merging will
    be skipped.
 
 Calling the command without arguments will infer the target stage from the
@@ -36,38 +36,33 @@ def deploy(target_stage = nil)
   merge_needed = (source_branch != target_branch)
 
   announce "Checking whether your #{source_branch} branch is ready"
-  diff_size = `git fetch && git diff #{source_branch} origin/#{source_branch} | wc -l`.strip
-  changes_size = `git status -s | wc -l`.strip
-
-  if merge_needed and diff_size != '0'
-    fail "Your #{source_branch} branch is not the same as on origin. Fix that first."
-  elsif changes_size != '0'
+  if `git status -s | wc -l`.strip != '0'
     fail "Your #{source_branch} branch holds uncommitted changes. Fix that first."
   else
     note 'All good.'
   end
 
   if merge_needed
-    announce "Checking what's in your #{target_branch} branch right now ..."
+    announce "Checking what's in your #{target_branch} branch right now"
     Util.system! "git checkout #{target_branch} && git pull"
   end
 
-  announce "You are about to #{'merge & ' if merge_needed}push & deploy the following commits"
+  announce "You are about to #{'merge & ' if merge_needed}push & deploy"
   note "From branch #{source_branch}"
   note "Merge into branch #{target_branch}" if merge_needed
   note "Deploy to #{target_stage}"
   Util.system! "git --no-pager log origin/#{target_branch}..#{source_branch} --oneline"
 
   if prompt('Go ahead with the deployment?', 'n', /y|yes/)
+    cap3 = file_containing?('Capfile', 'capistrano/setup')
     capistrano_call = "cap #{target_stage} deploy"
-    capistrano_call << ':migrations' unless options.no_migrations
+    capistrano_call << ':migrations' unless cap3 || options.no_migrations
     capistrano_call = "bundle exec #{capistrano_call}" if file_containing?('Gemfile', /capistrano/)
 
     puts
     command = "git push && #{capistrano_call}"
     command = "git merge #{source_branch} && " << command if merge_needed
-    puts 'Pretending to execute:', command
-    # Util.system! command, :show_cmd => true
+    Util.system! command, :show_cmd => true
 
     success 'Deployment complete.'
   else

data/lib/geordi/commands/firefox.rb

@@ -1,15 +1,17 @@
-desc 'firefox COMMAND', 'Run a command with firefox for selenium set up'
+desc 'firefox COMMAND', 'Run a command with VNC set up (and the test firefox, if present)'
 long_desc <<-LONGDESC
 Example: `geordi firefox b cucumber` or `geordi firefox --setup 24.0`
 
-Useful when you need Firefox for Selenium, but can't use the `geordi cucumber`
-command.
+Useful when you need Firefox for Selenium or the VNC set up, but can't use the
+`geordi cucumber` command.
 
 *Install* a special Firefox by calling with `--setup <version>`.
+
+This command is aliased `chrome` for users running Selenium in Chrome.
 LONGDESC
 
 option :setup, :type => :string, :banner => 'setup=FIREFOX_VERSION',
-  :desc => 'If set, will install a special Firefox with the given version'
+  :desc => 'Install a special test-runner Firefox with the given version'
 
 def firefox(*command)
   if options.setup
@@ -17,9 +19,8 @@ def firefox(*command)
     Geordi::FirefoxForSelenium.install(options.setup)
 
   else
-    note 'Setting up Firefox for Selenium ...'
-
     require 'geordi/cucumber'
+
     Cucumber.new.setup_vnc
     FirefoxForSelenium.setup_firefox
 
@@ -28,3 +29,5 @@ def firefox(*command)
     system *command # Util.system! would reset the Firefox PATH
   end
 end
+
+map 'chrome' => 'firefox'

data/lib/geordi/commands/png_optimize.rb

@@ -1,4 +1,4 @@
-desc 'png-optimize', 'Optimize .png files'
+desc 'png-optimize PATH', 'Optimize .png files'
 long_desc <<-LONGDESC
 - Removes color profiles: cHRM, sRGB, gAMA, ICC, etc.
 - Eliminates unused colors and reduces bit-depth (if possible)
@@ -17,7 +17,7 @@ Optimize a single file:
     geordi png-optimize input.png
 LONGDESC
 
-def png_optimize(*args)
+def png_optimize(path)
   require 'fileutils'
 
   announce 'Optimizing .png files'
@@ -27,7 +27,6 @@ def png_optimize(*args)
   end
 
   po = PngOptimizer.new
-  path = args[0]
   if File.directory?(path)
     po.batch_optimize_inplace(path)
   elsif File.file?(path)

data/lib/geordi/commands/shell.rb

@@ -1,6 +1,3 @@
-# This method has a triple 'l' because :shell is a Thor reserved word. However,
-# it can still be called with `geordi shell` :)
-
 desc 'shell TARGET', 'Open a shell on a Capistrano deploy target'
 long_desc <<-LONGDESC
 Example: `geordi shell production`
@@ -12,6 +9,8 @@ LONGDESC
 
 option :select_server, :default => false, :type => :boolean, :aliases => '-s'
 
+# This method has a triple 'l' because :shell is a Thor reserved word. However,
+# it can still be called with `geordi shell` :)
 def shelll(target, *args)
   require 'geordi/remote'
 

data/lib/geordi/cucumber.rb

@@ -15,14 +15,14 @@ module Geordi
     VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}"
     VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER]
 
-    def run(files, options)
+    def run(files, options = {})
       self.argv = files
 
       consolidate_rerun_txt_files
       show_features_to_run
       setup_vnc
 
-      command = use_parallel_tests? ? parallel_execution_command : serial_execution_command
+      command = use_parallel_tests?(options) ? parallel_execution_command : serial_execution_command
       note_cmd(command) if options[:verbose]
 
       puts
@@ -36,7 +36,7 @@ module Geordi
         end
         unless $?.success?
           if $?.exitstatus == 127
-            fail 'VNC viewer not found. Install it with `geordi setup-vnc`.'
+            fail 'VNC viewer not found. Install it with `geordi vnc --setup`.'
           else
             note 'VNC viewer could not be opened:'
             puts error
@@ -60,7 +60,7 @@ module Geordi
         ENV["BROWSER"] = ENV["LAUNCHY_BROWSER"] = File.expand_path('../../../bin/launchy_browser', __FILE__)
         ENV["DISPLAY"] = VNC_DISPLAY
 
-        note 'Selenium is running in a VNC window. Use `geordi vnc-show` to view it.'
+        note 'VNC is ready to hold Selenium test browsers. Use `geordi vnc` to view them.'
       end
     end
 
@@ -81,14 +81,17 @@ module Geordi
       self.argv = argv - command_line_features
       gem 'parallel_tests', parallel_tests_version
       require 'parallel_tests'
+
       type_arg = Gem::Version.new(::ParallelTests::VERSION) > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
-      features_to_run = command_line_features
-      features_to_run = find_all_features_recursively('features') if features_to_run.empty?
-      features_to_run = features_to_run.join(" ")
-      parallel_tests_args = "-t #{type_arg}"
-      cucumber_args = command_line_args.join(' ')
+      features = features_to_run
+      features = find_all_features_recursively('features') if features.empty?
 
-      [use_firefox_for_selenium, 'b parallel_test', parallel_tests_args, cucumber_args, "-- #{features_to_run}"].flatten.compact.join(" ")
+      [
+        use_firefox_for_selenium,
+        'b parallel_test -t ' + type_arg,
+        "-o '#{ command_line_options.join(' ') } --tags ~@solo'",
+        "-- #{ features.join(' ') }"
+      ].compact.join(' ')
     end
 
     def use_firefox_for_selenium
@@ -105,7 +108,11 @@ module Geordi
     end
 
     def show_features_to_run
-      if features_to_run.empty?
+      if command_line_options.include? '@solo'
+        note 'All features tagged with @solo'
+      elsif command_line_options.include? 'rerun'
+        note 'Rerunning failed scenarios'
+      elsif features_to_run.empty?
         note 'All features in features/'
       else
         notification = 'Only: ' + features_to_run.join(', ')
@@ -116,7 +123,7 @@ module Geordi
 
     def features_to_run
       @features_to_run ||= begin
-        features = command_line_features
+        features = find_all_features_recursively(command_line_features)
         features = rerun_txt_features if features.empty?
         features
       end
@@ -133,18 +140,18 @@ module Geordi
     end
 
     def command_line_features
-      @command_line_features ||= argv - command_line_args
+      @command_line_features ||= argv - command_line_options
     end
 
-    def command_line_args
-      @command_line_args ||= Array.new.tap do |args|
+    def command_line_options
+      @command_line_options ||= Array.new.tap do |args|
         # Sorry for this mess. Option parsing doesn't get much prettier.
         argv.each_cons(2) do |a, b|
           break if a == '--' # This is the common no-options-beyond marker
 
           case a
-          when '-f', '--format', '-p', '--profile'
-            args << a << b # b is the value of the option
+          when '-f', '--format', '-p', '--profile', '-t', '--tags'
+            args << a << b # b is the value for the option
           else
             args << a if a.start_with? '-'
           end
@@ -183,17 +190,10 @@ module Geordi
       end.flatten.uniq.compact
     end
 
-    def features_can_run_with_parallel_tests?(features)
-      features.none? { |f| f.include? ':' }
-    end
-
-    # Check if cucumber_spinner is available
     def spinner_available?
       @spinner_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
     end
 
-
-    # Check if parallel_tests is available
     def parallel_tests_available?
       not parallel_tests_version.nil?
     end
@@ -208,10 +208,11 @@ module Geordi
       end
     end
 
-    def use_parallel_tests?
-      not(argv.include?('rerun') or features_to_run.size == 1) &&
+    def use_parallel_tests?(options)
+      options.fetch(:parallel, true) &&
+        features_to_run.size != 1 &&
         parallel_tests_available? &&
-        features_can_run_with_parallel_tests?(features_to_run)
+        features_to_run.none? { |f| f.include? ':' }
     end
 
     def try_and_start_vnc
@@ -225,7 +226,7 @@ module Geordi
         98 # was already running after all
         true
       when 127 # not installed
-        warn 'Could not launch VNC server. Install it with `geordi setup-vnc`.'
+        warn 'Could not launch VNC server. Install it with `geordi vnc --setup`.'
         false
       else
         warn 'Starting VNC failed:'

data/lib/geordi/firefox_for_selenium.rb

@@ -1,21 +1,36 @@
 require 'pathname'
 require 'tempfile'
+require 'geordi/interaction'
 
 module Geordi
   module FirefoxForSelenium
-    include Geordi::Interaction
+    extend Geordi::Interaction
 
     FIREFOX_FOR_SELENIUM_BASE_PATH = Pathname.new('~/bin/firefoxes').expand_path
     FIREFOX_FOR_SELENIUM_PROFILE_NAME = 'firefox-for-selenium'
-    DEFAULT_FIREFOX_VERSION = "5.0.1"
-    VERSION_SPECIFICATION_FILE = Pathname.new(".firefox-version")
+    FIREFOX_VERSION_FILE = Pathname.new('.firefox-version')
 
     def self.install(version)
       Installer.new(version).run
     end
 
     def self.path_from_config
-      PathFromConfig.new.run
+      version = FIREFOX_VERSION_FILE.exist? && File.read(FIREFOX_VERSION_FILE).strip
+
+      if version and version != 'system'
+        unless FirefoxForSelenium.binary(version).exist?
+          warn "Firefox #{ version } not found"
+
+          note strip_heredoc(<<-INSTRUCTIONS)
+          Install it with
+            geordi firefox --setup #{ version }
+          INSTRUCTIONS
+
+          prompt 'Run tests anyway?', 'n', /y|yes/ or fail 'Cancelled.'
+        end
+
+        path(version)
+      end
     end
 
     def self.path(version)
@@ -28,68 +43,14 @@ module Geordi
 
     def self.setup_firefox
       path = path_from_config
+
       if path
         ENV['PATH'] = "#{path}:#{ENV['PATH']}"
+        note 'Firefox for Selenium set up'
       end
     end
 
 
-    class PathFromConfig
-      include Geordi::Interaction
-
-      def run
-        unless system_firefox
-          get_version
-          validate_install
-          path
-        end
-      end
-
-      private
-
-      def path
-        FirefoxForSelenium.path(@version)
-      end
-
-      def system_firefox
-        version_from_cuc_file == "system"
-      end
-
-      def get_version
-        @version = version_from_cuc_file || default_version
-      end
-
-      def default_version
-        warn "No firefox version given, defaulting to #{DEFAULT_FIREFOX_VERSION}."
-        note "Specify a version by putting it in a file named \"#{VERSION_SPECIFICATION_FILE}\"."
-        puts
-        DEFAULT_FIREFOX_VERSION
-      end
-
-      def validate_install
-        unless FirefoxForSelenium.binary(@version).exist?
-          note "Firefox #{@version} not found."
-
-          puts strip_heredoc(<<-INSTRUCTIONS)
-          Install it with
-            geordi setup_firefox_for_selenium #{@version}
-
-          If you want to use your system firefox and not see this message, add
-          a .firefox-version file with the content "system".
-
-          INSTRUCTIONS
-
-          prompt "Press ENTER to continue or press CTRL+C to abort."
-        end
-      end
-
-      def version_from_cuc_file
-        File.read(VERSION_SPECIFICATION_FILE).strip if VERSION_SPECIFICATION_FILE.exist?
-      end
-
-    end
-
-
     class Installer
       include Geordi::Interaction
 

data/lib/geordi/interaction.rb

@@ -43,7 +43,6 @@ module Geordi
       message = "#{text} "
       message << "[#{default}] " if default
 
-      puts
       print "\e[36m#{message}\e[0m" # cyan
       input = $stdin.gets.strip
       input = default if input.empty? && default

data/lib/geordi/remote.rb

@@ -32,16 +32,20 @@ module Geordi
     end
 
     def dump(options = {})
-      shell(options.merge :remote_command => "dumple #{@config.env} --for_download")
+      # Generate dump on the server
+      shell options.merge({
+        :remote_command => "dumple #{@config.env} --for_download",
+        :select_server => nil # Dump must be generated on the primary server
+      })
 
       destination_directory = File.join(@config.root, 'tmp')
       FileUtils.mkdir_p destination_directory
       destination_path = File.join(destination_directory, "#{@stage}.dump")
       relative_destination = Pathname.new(destination_path).relative_path_from Pathname.new(@config.root)
 
-      puts
       note "Downloading remote dump to #{relative_destination} ..."
-      Util.system! "scp #{@config.user}@#{@config.primary_server}:#{REMOTE_DUMP_PATH} #{destination_path}"
+      server = @config.primary_server
+      Util.system! "scp #{ @config.user(server) }@#{ server }:#{REMOTE_DUMP_PATH} #{destination_path}"
 
       success "Dumped the #{@stage} database to #{relative_destination}."
 
@@ -55,11 +59,11 @@ module Geordi
     def shell(options = {})
       server = options[:select_server] ? select_server : @config.primary_server
 
-      remote_command = "cd #{@config.path} && #{@config.shell}"
+      remote_command = "cd #{@config.remote_root} && #{@config.shell}"
       remote_command << " -c '#{options[:remote_command]}'" if options[:remote_command]
 
       note 'Connecting to ' + server.to_s
-      Util.system! 'ssh', "#{@config.user}@#{server}", '-t', remote_command
+      Util.system! 'ssh', "#{ @config.user(server) }@#{ server }", '-t', remote_command
     end
 
   end

data/lib/geordi/util.rb

@@ -38,8 +38,12 @@ module Geordi
         options = commands.last.is_a?(Hash) ? commands.pop : {}
         note_cmd commands.join(' ') if options[:show_cmd]
 
-        # Remove Geordi's Bundler environment when running commands.
-        Bundler.clean_system(*commands) or fail(options[:fail_message] || 'Something went wrong.')
+        if ENV['GEORDI_TESTING']
+          puts "Util.system! #{ commands.join(' ') }"
+        else
+          # Remove Geordi's Bundler environment when running commands.
+          Bundler.clean_system(*commands) or fail(options[:fail_message] || 'Something went wrong.')
+        end
       end
 
       def console_command(environment)

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,6 +53,7 @@ files:
 - .gitignore
 - .ruby-version
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -74,10 +75,15 @@ files:
 - bin/run_tests
 - bin/shell-for
 - bin/tests
+- features/console.feature
+- features/cucumber.feature
+- features/dump.feature
+- features/firefox.feature
+- features/shell.feature
+- features/support/env.rb
 - geordi.gemspec
 - lib/geordi.rb
 - lib/geordi/COMMAND_TEMPLATE
-- lib/geordi/capistrano.rb
 - lib/geordi/capistrano_config.rb
 - lib/geordi/cli.rb
 - lib/geordi/commands/_setup_vnc.rb
@@ -115,14 +121,13 @@ files:
 - lib/geordi/gitpt.rb
 - lib/geordi/interaction.rb
 - lib/geordi/remote.rb
-- lib/geordi/run_tests.rb
 - lib/geordi/util.rb
 - lib/geordi/version.rb
 homepage: http://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! '    Binary `geordi` installed
+post_install_message: ! 'Binary `geordi` installed
 
 '
 rdoc_options: []