geordi 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d8d2aedced0e3ecb654e08fc2c78c1a5c2c463
-  data.tar.gz: bc8f991eaaa88f1660486c3a6aefc9fb07e2a061
+  metadata.gz: 353c82b4e3fed11c19b3cf347e50f18d14253ae4
+  data.tar.gz: da71d1156fb486d8fa27218573470c99948cb7de
 SHA512:
-  metadata.gz: 9df5ded7314adcbbb35ba3722aa39e9e2cccfbda1e668486620454c9034efa267884f2058643ed88c8a3ffa931ee9a9104e3c23e5bf055f573c19af42ca629a0
-  data.tar.gz: 49ce0690a6dd0dd75600e6b6c012e60eafad2606d2e42a067b3a98c6cdbf0e5d58ebd3982c213e9b0449ce09ba6ee3da2b900e9d513dc4fc34eb32d51170552a
+  metadata.gz: 31362eec0538ed4b3e99a875fe9ec98a6e5e9252a6cfbbc44bb3146fccecd5e7d7a3c47ad1fb46e09d725c37830c6b3a3a2efbb670bda4f566644c0206edb5cf
+  data.tar.gz: f14ae5d1b9fdd7f0e0fda47b4947ba6685ea2422e80d4b037aeae61eefa9b5cc12237475d5bb3449e2aeba294849e86669d0c04eaf34ea00670e1f16a6194695

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (1.4.3)
+    geordi (1.5.0)
       thor (>= 0.18.0)
 
 GEM

data/README.md

@@ -4,45 +4,47 @@ Geordi
 Geordi is a collection of command line tools we use in our daily work with
 Ruby, Rails and Linux at [makandra](http://makandra.com/).
 
-Installing the `geordi` gem will install some binaries (see below):
+Installation:
 
     gem install geordi
 
 
-geordi
-------
+`geordi`
+--------
 
-The base command line utility offering most of the commands.
+The `geordi` binary holds most of the utility commands. For the few other
+binaries, see the bottom of this file.
 
-You may abbreviate commands by typing only the first letter(s), e.g. `geordi
-dev` will boot a development server, `geordi s -t` will setup a project and run
-tests afterwards. Underscores and dashes are equivalent.
+You may abbreviate commands by typing only their first letters, e.g. `geordi
+con` will boot a development console, `geordi set -t` will setup a project and
+run tests afterwards.
 
-For details on commands, e.g. supported options, run `geordi help <command>`.
+For details on commands, e.g. supported options, you may always run
+`geordi help <command>`.
 
-### geordi apache-site VIRTUAL_HOST
+### `geordi apache-site VIRTUAL_HOST`
 
 Enable the given virtual host, disabling all others.
 
 
-### geordi capistrano COMMAND
+### `geordi capistrano COMMAND`
 
 Run a capistrano command on all deploy targets.
 
 Example: `geordi capistrano deploy`
 
 
-### geordi clean
+### `geordi clean`
 
 Remove unneeded files from the current directory.
 
 
-### geordi commit
+### `geordi commit`
 
 Commit using a story title from Pivotal Tracker.
 
 
-### geordi console [TARGET]
+### `geordi console [TARGET]`
 
 Open a Rails console locally or on a Capistrano deploy target.
 
@@ -51,7 +53,7 @@ Open a local Rails console: `geordi console`
 Open a Rails console on `staging`: `geordi console staging`
 
 
-### geordi cucumber [FILES]
+### `geordi cucumber [FILES and OPTIONS]`
 
 Run Cucumber features.
 
@@ -72,11 +74,11 @@ or `-d`.
 e.g. `--format pretty`.
 
 
-### geordi deploy [STAGE]
+### `geordi deploy [STAGE]`
 
 Guided deployment across branches.
 
-Example: `geordi deploy production`
+Example: `geordi deploy` or `geordi deploy p[roduction]`
 
 Merge, push and deploy with a single command! There are several scenarios where
 this command comes in handy:
@@ -84,7 +86,7 @@ this command comes in handy:
 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 a 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
@@ -93,18 +95,18 @@ this command comes in handy:
 Calling the command without arguments will infer the target stage from the
 current branch and fall back to master/staging.
 
-When your project does not have a `deploy:migrations` task, this command will
-run `cap deploy` instead when called with `-M`: `geordi deploy -M staging`.
-
+Finds available Capistrano stages by their prefix, e.g. `geordi deploy p` will
+deploy production, `geordi deploy mak` will deploy a `makandra` stage if there
+is a file config/deploy/makandra.rb.
 
-### geordi devserver
+When your project is running Capistrano 3, deployment will use `cap deploy`
+instead of `cap deploy:migrations`. You can force using `deploy` by passing the
+-M option: `geordi deploy -M staging`.
 
-Start a development server.
 
+### `geordi dump [TARGET]`
 
-### geordi dump [TARGET]
-
-Handle dumps.
+Handle dumps (see `geordi help dump` for details).
 
 When called without arguments, dumps the development database with `dumple`.
 
@@ -126,14 +128,9 @@ dump into the development database after downloading it.
     geordi dump staging -l
 
 
-### geordi eurest
-
-Open the current Eurest cantina menu.
+### `geordi firefox COMMAND`
 
-
-### geordi firefox COMMAND
-
-Run a command with VNC set up (and the test firefox, if present).
+Run a command with VNC and test browser set up (alias: chrome).
 
 Example: `geordi firefox b cucumber` or `geordi firefox --setup 24.0`
 
@@ -145,12 +142,12 @@ Useful when you need Firefox for Selenium or the VNC set up, but can't use the
 This command is aliased `chrome` for users running Selenium in Chrome.
 
 
-### geordi help [COMMAND]
+### `geordi help [COMMAND]`
 
 Describe available commands or one specific command.
 
 
-### geordi migrate
+### `geordi migrate`
 
 Migrate all databases.
 
@@ -161,30 +158,20 @@ environment and `rake parallel:prepare` afterwards. Otherwise, invokes `geordi r
 with `db:migrate`.
 
 
-### geordi png-optimize PATH
+### `geordi png-optimize PATH`
 
 Optimize .png files.
 
+Example: `geordi png-optimize some/directory`
+
 - Removes color profiles: cHRM, sRGB, gAMA, ICC, etc.
 - Eliminates unused colors and reduces bit-depth (if possible)
 - May reduce PNG file size lossless
 
-Batch-optimize all `*.png` files in a directory:
-
-    geordi png-optimize directory
 
-Batch-optimize the current directory:
+### `geordi purge-kernels`
 
-    geordi png-optimize .
-
-Optimize a single file:
-
-    geordi png-optimize input.png
-
-
-### geordi purge-kernels
-
-Purge linux kernels older than the current one.
+[sudo] Purge linux kernels older than the current one.
 
 Example: `sudo geordi purge-kernels`
 
@@ -195,7 +182,7 @@ This script will retrieve and print a list of all current or older kernels. If
 confirmed, it will then purge all kernels older than the current one.
 
 
-### geordi rake TASK
+### `geordi rake TASK`
 
 Run a rake task in several Rails environments.
 
@@ -208,12 +195,12 @@ Example: `geordi rake db:migrate`
 - cucumber
 
 
-### geordi remove-executable-flags
+### `geordi remove-executable-flags`
 
 Remove executable-flags from files that should not be executable.
 
 
-### geordi rspec [FILES]
+### `geordi rspec [FILES]`
 
 Run RSpec.
 
@@ -223,7 +210,7 @@ Runs RSpec as you want: with RSpec 1/2 detection, `bundle exec`, rspec_spinner
 detection, etc.
 
 
-### geordi security-update [STEP]
+### `geordi security-update [STEP]`
 
 Support for performing security updates.
 
@@ -235,7 +222,12 @@ Switches branches, pulls, pushes and deploys as required by our workflow. Tells
 what it will do before it does it.
 
 
-### geordi setup
+### `geordi server [PORT]`
+
+Start a development server.
+
+
+### `geordi setup`
 
 Setup a project for the first time.
 
@@ -257,7 +249,7 @@ After setting up, runs all tests when called with the `--test` option:
 See `geordi help setup` for details.
 
 
-### geordi shell TARGET
+### `geordi shell TARGET`
 
 Open a shell on a Capistrano deploy target.
 
@@ -268,17 +260,17 @@ Lets you select the server to connect to when called with `--select-server`:
     geordi shell production -s
 
 
-### geordi tests
+### `geordi tests`
 
 Run all employed tests.
 
 
-### geordi unit
+### `geordi unit`
 
 Run Test::Unit.
 
 
-### geordi update
+### `geordi update`
 
 Bring a project up to date.
 
@@ -298,12 +290,12 @@ After updating, runs all tests when called with the `--test` option:
 See `geordi help update` for details.
 
 
-### geordi version
+### `geordi version`
 
 Print the current version of geordi.
 
 
-### geordi vnc
+### `geordi vnc`
 
 Show the hidden VNC window.
 
@@ -355,7 +347,7 @@ calling your local geordi like so (adjust paths to your needs):
     ruby -I ../geordi/lib ../geordi/bin/geordi <command>
 
 Don't forget to update this README. The whole `geordi` section is auto-generated
-by `rake update_readme`.
+by `rake readme`.
 
 Geordi is (partially) tested with Cucumber and Aruba. Run all tests with `rake`.
 Of course you're free to use `geordi tests` ;)

data/Rakefile

@@ -8,12 +8,12 @@ task :features do
   system 'cucumber'
 end
 
-task :update_readme do
+task :readme do
   require File.expand_path('../lib/geordi/cli', __FILE__)
 
   readme = File.read('README.md')
   geordi_section_regex = /
-    geordi\n
+    `geordi`\n
     -{3,}   # 3 dashes or more
     .*?     # anything, non-greedy
     (?=     # stop before:
@@ -22,22 +22,24 @@ task :update_readme do
   /xm
 
   geordi_section = <<-TEXT
-geordi
-------
+`geordi`
+--------
 
-The base command line utility offering most of the commands.
+The `geordi` binary holds most of the utility commands. For the few other
+binaries, see the bottom of this file.
 
-You may abbreviate commands by typing only the first letter(s), e.g. `geordi
-dev` will boot a development server, `geordi s -t` will setup a project and run
-tests afterwards. Underscores and dashes are equivalent.
+You may abbreviate commands by typing only their first letters, e.g. `geordi
+con` will boot a development console, `geordi set -t` will setup a project and
+run tests afterwards.
 
-For details on commands, e.g. supported options, run `geordi help <command>`.
+For details on commands, e.g. supported options, you may always run
+`geordi help <command>`.
 
   TEXT
 
   Geordi::CLI.all_commands.sort.each do |_, command|
     unless command.hidden?
-      geordi_section << "### geordi #{ command.usage }\n\n"
+      geordi_section << "### `geordi #{ command.usage }`\n\n"
       geordi_section << "#{ command.description.sub /(\.)?$/, '.' }\n\n"
       geordi_section << "#{ command.long_description.strip }\n\n" if command.long_description
       geordi_section << "\n"

data/features/cucumber.feature

@@ -123,7 +123,26 @@ Feature: The cucumber command
     Then the output should contain "# Running features"
       And the output should match /^> .*cucumber .*--tags ~@solo/
     But the output should not contain "# Running @solo features"
-      And the output should not match /^> .*cucumber .*--tags @solo/
+
+
+  Scenario: When called with line numbers, the @solo extra run is skipped
+
+    Note that with line numbers in the passed file names, features are run
+    serially.
+
+    Given a file named "features/example.feature" with:
+    """
+    Feature: Test without solo tag
+      Scenario: Example scenario
+      Scenario: Other scenario
+    """
+
+    When I run `geordi cucumber --verbose features/example.feature:2`
+    Then the output should contain "# Running features"
+    But the output should not contain "# Running @solo features"
+      # Regression test, with line numbers grep would fail with:
+      #   grep: features/example.feature:2: No such file or directory
+      And the output should not contain "No such file or directory"
 
 
   Scenario: Specifying a firefox version to use

data/features/firefox.feature

@@ -51,3 +51,8 @@ Feature: The firefox/chrome command
     Then the output should contain "> VNC is ready"
       And the output should contain "testcontent"
     But the output should not contain "Firefox for Selenium"
+
+
+  Scenario: Running --setup without a version prints an error
+    When I run `geordi firefox --setup`
+    Then the output should contain "Firefox version required"

data/features/server.feature

@@ -0,0 +1,24 @@
+Feature: The server/devserver command
+
+  Scenario: Booting a development server
+    When I run `geordi server`
+    Then the output should contain "http://aruba.vcap.me:3000"
+      And the output should contain "Util.system! bundle exec rails server -p 3000 -b 0.0.0.0"
+
+
+  Scenario: Passing a port as argument
+    When I run `geordi server 3001`
+    Then the output should contain "http://aruba.vcap.me:3001"
+      And the output should contain "Util.system! bundle exec rails server -p 3001 -b 0.0.0.0"
+
+
+  Scenario: Passing a port as option
+    When I run `geordi server -p 3001`
+    Then the output should contain "http://aruba.vcap.me:3001"
+    And the output should contain "Util.system! bundle exec rails server -p 3001 -b 0.0.0.0"
+
+
+  Scenario: The command is aliased for backwards compatibility
+    When I run `geordi devserver`
+    Then the output should contain "Util.system! bundle exec rails server -p 3000 -b 0.0.0.0"
+

data/lib/geordi/commands/cucumber.rb

@@ -49,15 +49,20 @@ def cucumber(*args)
     end
 
     # Serial run of @solo scenarios
-    files << 'features' if files.empty? # Proper grepping
-    solo_tag_usages = `grep -r '@solo' #{ files.join(' ') }`.split("\n")
-    if solo_tag_usages.any?
-      cmd_opts << '--tags' << '@solo'
+    if files.any? { |f| f.include? ':' }
+      note '@solo run skipped when called with line numbers' if options.verbose
+    else
+      files << 'features' if files.empty? # Proper grepping
+      solo_tag_usages = `grep -r '@solo' #{ files.join(' ') }`.split("\n")
 
-      announce 'Running @solo features'
-      Geordi::Cucumber.new.run files, cmd_opts, :verbose => options.verbose, :parallel => false
-    end
+      if solo_tag_usages.any?
+        cmd_opts << '--tags' << '@solo'
+
+        announce 'Running @solo features'
+        Geordi::Cucumber.new.run files, cmd_opts, :verbose => options.verbose, :parallel => false
+      end
 
+    end
   else
     note 'Cucumber not employed.'
   end

data/lib/geordi/commands/deploy.rb

@@ -1,6 +1,6 @@
 desc 'deploy [STAGE]', 'Guided deployment across branches'
 long_desc <<-LONGDESC
-Example: `geordi deploy production`
+Example: `geordi deploy` or `geordi deploy p[roduction]`
 
 Merge, push and deploy with a single command! There are several scenarios where
 this command comes in handy:
@@ -8,7 +8,7 @@ this command comes in handy:
 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 a 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
@@ -17,8 +17,13 @@ this command comes in handy:
 Calling the command without arguments will infer the target stage from the
 current branch and fall back to master/staging.
 
-When your project does not have a `deploy:migrations` task, this command will
-run `cap deploy` instead when called with `-M`: `geordi deploy -M staging`.
+Finds available Capistrano stages by their prefix, e.g. `geordi deploy p` will
+deploy production, `geordi deploy mak` will deploy a `makandra` stage if there
+is a file config/deploy/makandra.rb.
+
+When your project is running Capistrano 3, deployment will use `cap deploy`
+instead of `cap deploy:migrations`. You can force using `deploy` by passing the
+-M option: `geordi deploy -M staging`.
 LONGDESC
 
 option :no_migrations, :aliases => '-M', :type => :boolean,
@@ -27,31 +32,40 @@ option :no_migrations, :aliases => '-M', :type => :boolean,
 def deploy(target_stage = nil)
   # Set/Infer default values
   branch_stage_map = { 'master' => 'staging', 'production' => 'production'}
+  if target_stage and not Util.deploy_targets.include? target_stage
+    # Target stage autocompletion from available stages
+    target_stage = Util.deploy_targets.find { |t| t.start_with? target_stage }
+  end
   proposed_stage = target_stage || branch_stage_map.fetch(Util.current_branch, 'staging')
 
-  target_stage = prompt 'Deployment capistrano stage:', proposed_stage
+  # Ask for required information
+  target_stage = prompt 'Deployment stage:', proposed_stage
   source_branch = prompt 'Source branch:', Util.current_branch
   target_branch = prompt 'Deploy branch:', branch_stage_map.invert.fetch(target_stage, 'master')
 
   merge_needed = (source_branch != target_branch)
+  push_needed = merge_needed || `git cherry -v | wc -l`.strip.to_i > 0
 
   announce "Checking whether your #{source_branch} branch is ready"
   if `git status -s | wc -l`.strip != '0'
-    fail "Your #{source_branch} branch holds uncommitted changes. Fix that first."
+    warn "Your #{source_branch} branch holds uncommitted changes."
+    prompt('Continue anyway?', 'n', /y|yes/) or fail 'Cancelled.'
   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"
-  note "From branch #{source_branch}"
-  note "Merge into branch #{target_branch}" if merge_needed
+  announce 'You are about to:' #################################################
+  note "Merge branch #{source_branch} into #{target_branch}" if merge_needed
+  if push_needed
+    note 'Push these commits:' if push_needed
+    Util.system! "git --no-pager log origin/#{target_branch}..#{source_branch} --oneline"
+  end
   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')
@@ -59,10 +73,14 @@ def deploy(target_stage = nil)
     capistrano_call << ':migrations' unless cap3 || options.no_migrations
     capistrano_call = "bundle exec #{capistrano_call}" if file_containing?('Gemfile', /capistrano/)
 
+    invoke_cmd 'bundle_install'
+
     puts
-    command = "git push && #{capistrano_call}"
-    command = "git merge #{source_branch} && " << command if merge_needed
-    Util.system! command, :show_cmd => true
+    commands = []
+    commands << "git merge #{source_branch}" if merge_needed
+    commands << 'git push' if push_needed
+    commands << capistrano_call
+    Util.system! commands.join(' && '), :show_cmd => true
 
     success 'Deployment complete.'
   else

data/lib/geordi/commands/dump.rb

@@ -1,4 +1,4 @@
-desc 'dump [TARGET]', 'Handle dumps'
+desc 'dump [TARGET]', 'Handle dumps (see `geordi help dump` for details)'
 long_desc <<-DESC
 When called without arguments, dumps the development database with `dumple`.
 

data/lib/geordi/commands/eurest.rb

@@ -1,4 +1,4 @@
-desc 'eurest', 'Open the current Eurest cantina menu'
+desc 'eurest', 'Open the current Eurest cantina menu', :hide => true
 def eurest
   Util.system! %{file="Speiseplan_KW`date +%V`.pdf" && wget -O/tmp/$file http://www.eurest-extranet.de/eurest/export/sites/default/sigma-technopark/de/downloads/$file && xdg-open /tmp/$file}
 end

data/lib/geordi/commands/firefox.rb

@@ -1,4 +1,4 @@
-desc 'firefox COMMAND', 'Run a command with VNC set up (and the test firefox, if present)'
+desc 'firefox COMMAND', 'Run a command with VNC and test browser set up (alias: chrome)'
 long_desc <<-LONGDESC
 Example: `geordi firefox b cucumber` or `geordi firefox --setup 24.0`
 
@@ -10,11 +10,13 @@ Useful when you need Firefox for Selenium or the VNC set up, but can't use the
 This command is aliased `chrome` for users running Selenium in Chrome.
 LONGDESC
 
-option :setup, :type => :string, :banner => 'setup=FIREFOX_VERSION',
-  :desc => 'Install a special test-runner Firefox with the given version'
+option :setup, :banner => 'FIREFOX_VERSION',
+  :desc => 'Install a special test runner Firefox with the given version'
 
 def firefox(*command)
   if options.setup
+    fail 'Firefox version required (e.g. --setup 24.0)' if options.setup == 'setup'
+
     require 'geordi/firefox_for_selenium'
     Geordi::FirefoxForSelenium.install(options.setup)
 

data/lib/geordi/commands/png_optimize.rb

@@ -1,20 +1,10 @@
 desc 'png-optimize PATH', 'Optimize .png files'
 long_desc <<-LONGDESC
+Example: `geordi png-optimize some/directory`
+
 - Removes color profiles: cHRM, sRGB, gAMA, ICC, etc.
 - Eliminates unused colors and reduces bit-depth (if possible)
 - May reduce PNG file size lossless
-
-Batch-optimize all `*.png` files in a directory:
-
-    geordi png-optimize directory
-
-Batch-optimize the current directory:
-
-    geordi png-optimize .
-
-Optimize a single file:
-
-    geordi png-optimize input.png
 LONGDESC
 
 def png_optimize(path)
@@ -23,7 +13,7 @@ def png_optimize(path)
   announce 'Optimizing .png files'
 
   if `which pngcrush`.strip.empty?
-    fail 'You have to install pngcrush first (sudo apt-get install pngcrush)'
+    fail 'Please install pngcrush first (sudo apt-get install pngcrush)'
   end
 
   po = PngOptimizer.new

data/lib/geordi/commands/purge_kernels.rb

@@ -1,4 +1,4 @@
-desc 'purge-kernels', 'Purge linux kernels older than the current one'
+desc 'purge-kernels', '[sudo] Purge linux kernels older than the current one'
 long_desc <<-LONGDESC
 Example: `sudo geordi purge-kernels`
 

data/lib/geordi/commands/server.rb

@@ -0,0 +1,19 @@
+desc 'server [PORT]', 'Start a development server'
+
+option :port, :aliases => '-p', :default => '3000',
+  :desc => 'Choose a port'
+
+def server(port = nil)
+  invoke_cmd 'bundle_install'
+  require 'geordi/util'
+
+  announce 'Booting a development server'
+  port ||= options.port
+  note "URL: http://#{ File.basename(Dir.pwd) }.vcap.me:#{port}"
+  puts
+
+  # -b 0.0.0.0: Allow connections from other machines, e.g. a testing iPad
+  Util.system! Util.server_command, "-p #{ port }", '-b 0.0.0.0'
+end
+
+map 'devserver' => 'server'

data/lib/geordi/commands/tests.rb

@@ -1,9 +1,14 @@
 desc 'tests', 'Run all employed tests'
 def tests
-  invoke_cmd 'with_rake'
-  invoke_cmd 'unit'
-  invoke_cmd 'rspec'
-  invoke_cmd 'cucumber'
+  rake_result = invoke_cmd 'with_rake'
+
+  if rake_result == :did_not_perform
+    # Since `rake` usually runs all tests, only run them here if `rake` did not
+    # perform
+    invoke_cmd 'unit'
+    invoke_cmd 'rspec'
+    invoke_cmd 'cucumber'
+  end
 
   success 'Successfully ran tests.'
 end

data/lib/geordi/commands/with_rake.rb

@@ -1,11 +1,12 @@
 desc 'with-rake', 'Run tests with `rake`', :hide => true
 def with_rake
-  if file_containing?('Rakefile', /^task.+default.+(spec|test)/)
+  if file_containing?('Rakefile', /^task.+default.+(spec|test|feature)/)
     invoke_cmd 'bundle_install'
 
     announce 'Running tests with `rake`'
     Util.system! 'rake'
   else
     note '`rake` does not run tests.'
+    :did_not_perform
   end
 end

data/lib/geordi/firefox_for_selenium.rb

@@ -132,10 +132,10 @@ module Geordi
 
         puts strip_heredoc(<<-INSTRUCTION)
         Please download an old version of Firefox from: #{download_url}
-        Unpack it with: tar xvjf firefox-#{@version}.tar.bz2 -C #{path} --strip-components=1
+        Unpack it with: tar xjf firefox-#{@version}.tar.bz2 -C #{path} --strip-components=1
         Now #{path.join('firefox')} should be the firefox binary, not a directory.
         INSTRUCTION
-        prompt "Press ENTER when you're done."
+        prompt 'Continue?'
 
         File.file?(binary) or raise "Could not find #{binary}"
       end
@@ -170,15 +170,15 @@ module Geordi
         This script will open the patched copy of Firefox when you press ENTER.
         Please perform the following steps manually:
 
+        - IMPORTANT: Quickly disable all automatic updates under Edit /
+          Preferences / Advanced / Update
         - Disable the default browser check when Firefox launches
         - Check that the version number is correct (#{@version})
         - You should not see your bookmarks, add-ons, plugins from your regular
           Firefox profile
-        - Disable all automatic updates under Edit / Preferences / Advanced /
-          Update (do this quickly or Firefox will already have updated)
         INSTRUCTION
 
-        prompt 'Open the patched copy of Firefox with ENTER.'
+        prompt 'Will open the patched copy of Firefox now'
         run_firefox_for_selenium
       end
 

data/lib/geordi/util.rb

@@ -94,6 +94,12 @@ module Geordi
         end
       end
 
+      def deploy_targets
+        Dir['config/deploy/*'].map do |f|
+          File.basename f, '.rb' # Filename without .rb extension
+        end
+      end
+
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.4.3'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,7 @@ files:
 - features/dump.feature
 - features/firefox.feature
 - features/launchy_browser.feature
+- features/server.feature
 - features/shell.feature
 - features/support/env.rb
 - geordi.gemspec
@@ -98,7 +99,6 @@ files:
 - lib/geordi/commands/create_databases.rb
 - lib/geordi/commands/cucumber.rb
 - lib/geordi/commands/deploy.rb
-- lib/geordi/commands/devserver.rb
 - lib/geordi/commands/dump.rb
 - lib/geordi/commands/eurest.rb
 - lib/geordi/commands/firefox.rb
@@ -109,6 +109,7 @@ files:
 - lib/geordi/commands/remove_executable_flags.rb
 - lib/geordi/commands/rspec.rb
 - lib/geordi/commands/security_update.rb
+- lib/geordi/commands/server.rb
 - lib/geordi/commands/setup.rb
 - lib/geordi/commands/shell.rb
 - lib/geordi/commands/tests.rb

data/lib/geordi/commands/devserver.rb

@@ -1,14 +0,0 @@
-desc 'devserver', 'Start a development server'
-
-option :port, :aliases => '-p', :default => '3000'
-
-def devserver
-  invoke_cmd 'bundle_install'
-  require 'geordi/util'
-
-  announce 'Booting a development server'
-  note "URL: http://#{File.basename(Dir.pwd)}.vcap.me:#{options.port}"
-  puts
-
-  Util.system! Util.server_command + " -p #{options.port}"
-end