geordi 7.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ae1c9d784901988ec50b26da29a634e3105e5b2210803d55e02ecc9b219d79
-  data.tar.gz: 3c7294df5febf88bd97ddb2da25d6d0815d1fffb4ad9f4adfa59b1f96de53f09
+  metadata.gz: 1060f10e77e6173a1b8d63fd8c2d89579e5be0597a683f5358b01173e4c266de
+  data.tar.gz: 8a44e3cd313e779b84ae9ecfa0f92283f4dd3f45f7525ec0bc298b11a719c389
 SHA512:
-  metadata.gz: 495984bebb832bf7a3ac9c5539b591c8e89641cc382e4e10089b5c62fe97b3440d0be1c4ac6f27c6f7c04b571a6a662899a30f660855084a9c8ef640094f51da
-  data.tar.gz: '0821bd104debdc847d1699d9f5b80c3b553110d0027d632d2acf6a2a739d20005372de6788aeff225d7616c8d0200c9fc1fe4e5ff7f4f177e5bf3256f1084df0'
+  metadata.gz: c7793fda9e1494d3b1a2cf50dfa7b8c10ff61e8c7462596828fe6e44721f50dedbfe18ba2a2c2fb4e0b354500de9528f6e948e8716c9c1a31ceb42a49c8ea845
+  data.tar.gz: fedd7f3106bc5283b25b5f4e20fe1eda099d76c7e4b01483362cebde5cca516d559241d976ad51486a3bc71e11df5a3c21d14288c10805ad9af8307f48d7dab3

data/.github/workflows/test.yml

@@ -31,10 +31,6 @@ jobs:
       run: |
         gem install bundler:2.2.26
         bundle install --no-deployment
-    - name: Install VNC viewer
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y xtightvncviewer
     - name: Run tests
       run: bundle exec rake
     

data/CHANGELOG.md

@@ -3,16 +3,41 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
 ## Unreleased
 
 ### Compatible changes
+
 ### Breaking changes
 
 
-## 7.0.0 2021-08-25
+## 9.0.0 2021-12-02
+
+### Breaking changes
+* Remove the `geordi docker` command.
+
+
+## 8.0.0 2021-11-08
 
 ### Breaking changes
+* `geordi branch` now checks out new branches from the current branch instead of master. To check out from master, use `geordi branch -m`.
+
 
+## 7.0.2 2021-10-06
+
+### Compatible changes
+* fix `YAML.safe_load` for `psych` >= 4
+
+
+## 7.0.1 2021-08-13
+
+### Compatible changes
+* Fix missing `thor` dependency
+
+
+## 7.0.0 2021-08-25
+
+### Breaking changes
 * Drop support for Ruby < 2.5.0
 
 

data/Gemfile

@@ -11,5 +11,4 @@ gem 'parallel_tests'
 gem 'launchy'
 gem 'pry-byebug'
 gem 'tracker_api'
-gem 'thor', '~> 1'
 gem 'cucumber', '~> 4'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    geordi (7.0.0)
+    geordi (9.0.0)
+      thor (~> 1)
 
 GEM
   remote: http://rubygems.org/
@@ -161,8 +162,7 @@ DEPENDENCIES
   pry-byebug
   rake (< 13)
   rspec
-  thor (~> 1)
   tracker_api
 
 BUNDLED WITH
-   2.2.26
+   2.2.27

data/README.md

@@ -33,6 +33,9 @@ Example: `geordi branch`
 On the first execution we ask for your Pivotal Tracker API token. It will be
 stored in `~/.config/geordi/global.yml`.
 
+**Options**
+- `-m, [--from-master], [--no-from-master]`: Branch from master instead of the current branch
+
 
 ### `geordi capistrano COMMAND`
 Run a capistrano command on all deploy targets.
@@ -157,28 +160,6 @@ instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 - `-c, [--current-branch], [--no-current-branch]`: Set DEPLOY_BRANCH to the current branch during deploy
 
 
-### `geordi docker`
-Manage docker containers for the current project.
-
-Manage docker containers to run your project dockerized.
-
-It expects a `docker-compose.yml` file that specifies all services, and a service
-named "main" that opens a shell for the project.
-
-There are three subcommands:
-
-- `geordi docker setup`
-  Fetches all docker containers.
-
-- `geordi docker shell`
-  Runs the docker service named 'main'.
-  Append `--secondary` to open a second shell in an already running container.
-
-- `geordi docker vnc`
-  Opens a VNC viewer to connect to the VNC server in the container.
-  Append `--setup` to be guided through the setup of VNC viewer.
-
-
 ### `geordi drop-databases`
 Interactively delete local databases.
 

data/geordi.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'thor', '~> 1'
   # Development dependencies are defined in the Gemfile (therefore no `spec.add_development_dependency` directives)
 
   spec.post_install_message = <<-ATTENTION

data/lib/geordi/commands/branch.rb

@@ -6,7 +6,9 @@ On the first execution we ask for your Pivotal Tracker API token. It will be
 stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
+option :from_master, aliases: '-m', type: :boolean, desc: 'Branch from master instead of the current branch'
+
 def branch
   require 'geordi/gitpt'
-  Gitpt.new.run_branch
+  Gitpt.new.run_branch(from_master: options.from_master)
 end

data/lib/geordi/dump_loader.rb

@@ -14,8 +14,15 @@ module Geordi
       require 'yaml'
 
       evaluated_config_file = ERB.new(File.read('config/database.yml')).result
+
       # Allow aliases and a special set of classes like symbols and time objects
-      @config ||= YAML.safe_load(evaluated_config_file, [Symbol, Time], [], true)
+      permitted_classes = [Symbol, Time]
+      @config ||= if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+        YAML.safe_load(evaluated_config_file, permitted_classes: permitted_classes, aliases: true)
+      else
+        YAML.safe_load(evaluated_config_file, permitted_classes, [], true)
+      end
+
       @config['development']
     end
     alias_method :config, :development_database_config

data/lib/geordi/gitpt.rb

@@ -26,7 +26,7 @@ module Geordi
       end
     end
 
-    def run_branch
+    def run_branch(from_master: false)
       story = choose_story || Interaction.fail('No story selected.')
 
       normalized_story_name = normalize_string(story.name)
@@ -50,7 +50,7 @@ module Geordi
       if branch_name.present?
         checkout_branch branch_name, new_branch: false
       else
-        checkout_branch new_branch_name, new_branch: true
+        checkout_branch new_branch_name, new_branch: true, from_master: from_master
       end
     end
 
@@ -103,8 +103,6 @@ module Geordi
         menu.header = 'Choose a story'
 
         stories.each do |story|
-          print '.' # Progress
-
           state = story.current_state
           owners = story.owners
           owner_is_me = owners.collect(&:id).include?(my_id)
@@ -141,9 +139,9 @@ module Geordi
       HighLine::BOLD + string + HighLine::RESET
     end
 
-    def checkout_branch(name, new_branch: false)
+    def checkout_branch(name, new_branch: false, from_master: false)
       if new_branch
-        Util.run! ['git', 'checkout', 'master']
+        Util.run! ['git', 'checkout', 'master'] if from_master
         Util.run! ['git', 'checkout', '-b', name]
       else
         Util.run! ['git', 'checkout', name]

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '7.0.0'.freeze
+  VERSION = '9.0.0'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
-dependencies: []
+date: 2021-12-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Collection of command line tools we use in our daily work with Ruby,
   Rails and Linux at makandra.
 email:
@@ -53,7 +67,6 @@ files:
 - lib/geordi/commands/cucumber.rb
 - lib/geordi/commands/delete_dumps.rb
 - lib/geordi/commands/deploy.rb
-- lib/geordi/commands/docker.rb
 - lib/geordi/commands/drop_databases.rb
 - lib/geordi/commands/dump.rb
 - lib/geordi/commands/migrate.rb
@@ -73,7 +86,6 @@ files:
 - lib/geordi/commands/yarn_install.rb
 - lib/geordi/cucumber.rb
 - lib/geordi/db_cleaner.rb
-- lib/geordi/docker.rb
 - lib/geordi/dump_loader.rb
 - lib/geordi/gitpt.rb
 - lib/geordi/interaction.rb
@@ -88,7 +100,7 @@ metadata: {}
 post_install_message: 'Support for sequential running of integration tests tagged
   with @solo has been dropped.
 
-  '
+'
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails

data/lib/geordi/commands/docker.rb

@@ -1,52 +0,0 @@
-class DockerCLI < Thor
-  desc 'setup', 'Setup docker and fetch required docker-container for the current project'
-  def setup
-    docker.setup
-  end
-
-  desc 'shell', 'Open a shell in the main docker container for the current project'
-  option :secondary, default: false, type: :boolean
-  map 'shell' => '_shell'
-  def _shell
-    docker.shell(:secondary => options[:secondary])
-  end
-
-  desc 'vnc', 'Open a vnc viewer connecting to the docker container'
-  option :setup, default: false, type: :boolean, desc: 'Guide through the setup of VNC'
-  def vnc
-    if options.setup
-      docker.setup_vnc
-    else
-      docker.vnc
-    end
-  end
-
-  private
-
-  def docker
-    require 'geordi/docker'
-    Geordi::Docker.new
-  end
-end
-
-desc 'docker', 'Manage docker containers for the current project'
-long_desc <<-LONGDESC
-Manage docker containers to run your project dockerized.
-
-It expects a `docker-compose.yml` file that specifies all services, and a service
-named "main" that opens a shell for the project.
-
-There are three subcommands:
-
-- `geordi docker setup`
-  Fetches all docker containers.
-
-- `geordi docker shell`
-  Runs the docker service named 'main'.
-  Append `--secondary` to open a second shell in an already running container.
-
-- `geordi docker vnc`
-  Opens a VNC viewer to connect to the VNC server in the container.
-  Append `--setup` to be guided through the setup of VNC viewer.
-LONGDESC
-subcommand 'docker', DockerCLI

data/lib/geordi/docker.rb

@@ -1,183 +0,0 @@
-require 'geordi/interaction'
-require 'geordi/cucumber'
-require 'yaml'
-require 'open3'
-
-module Geordi
-  class Docker
-    DOCKER_COMPOSE_FILE = 'docker-compose.yml'.freeze
-
-    include Interaction
-
-    def setup
-      check_installation_and_config
-      announce('Fetching containers...')
-      if execute(:system, 'docker-compose', 'pull')
-        success('Fetch successful.')
-      else
-        fail('Fetch failed.')
-      end
-    end
-
-    def shell(options = {})
-      check_installation_and_config
-      if options[:secondary]
-        attach_to_running_shell
-      else
-        run_shell
-      end
-    end
-
-    def vnc
-      check_installation_and_config
-      launch_vnc_viewer('::5967')
-    end
-
-    def setup_vnc
-      `clear`
-      Interaction.note 'This script will help you install a VNC viewer.'
-      Interaction.note 'Please open a second shell to execute instructions.'
-      Interaction.prompt 'Continue ...'
-
-      Interaction.announce 'Setup VNC viewer'
-      vnc_viewer_installed = system('which vncviewer > /dev/null 2>&1')
-      if vnc_viewer_installed
-        Interaction.success 'It appears you already have a VNC viewer installed. Good job!'
-      else
-        puts 'Please run:'
-        Interaction.note_cmd 'sudo apt-get install xtightvncviewer'
-        Interaction.prompt 'Continue ...'
-      end
-
-      puts
-      puts <<~TEXT
-        Done. You can view the VNC window with `geordi docker vnc`.
-      TEXT
-
-      Interaction.success 'Happy cuking!'
-    end
-
-    private
-
-    def launch_vnc_viewer(source)
-      fail('VNC viewer not found. Install it with `geordi docker vnc --setup`.') unless command_exists?('vncviewer')
-
-      fork do
-        error = capture_stderr do
-          system("vncviewer #{source}")
-        end
-        unless $?.success?
-          if $?.exitstatus == 127
-            fail('VNC viewer not found. Install it with `geordi docker vnc --setup`.')
-          else
-            fail("VNC viewer could not be opened: #{error}")
-          end
-        end
-      end
-      exit 0
-    end
-
-    def attach_to_running_shell
-      # The command line output of docker-compose ps changes depending on the container name length, this is
-      # caused by the varying terminal length and results in the longer outputs, e.g the container name and id
-      # to be cut after x characters and the rest being placed in the line below.
-
-      stdout_str, _error_str = execute(:capture, {'COLUMNS' => '400'}, 'docker-compose ps')
-      running_containers = stdout_str.split("\n")
-      if (main_container_line = running_containers.grep(/_main_run/).first)
-        container_name = main_container_line.split(' ').first
-        execute(:exec, 'docker', 'exec', '-it', container_name, 'bash')
-      else
-        fail('Could not find a running shell. Start without --secondary first.')
-      end
-    end
-
-    def run_shell
-      command = [:system, 'docker-compose', 'run', '--service-ports']
-      command += ssh_agent_forward
-      command += ['main']
-      execute(*command)
-      execute(:system, 'docker-compose', 'stop')
-    end
-
-    def execute(kind, *args)
-      if ENV['GEORDI_TESTING']
-        puts "Stubbed run #{args.join(' ')}"
-        if kind == :` || kind == :capture
-          mock_parse(*args)
-        else
-          mock_run(*args)
-        end
-      else
-        if kind == :capture
-          Open3.capture2(*args)
-        else
-          send(kind, *args)
-        end
-      end
-    end
-
-    def mock_run(*args)
-      # exists just to be stubbed in tests
-      true
-    end
-
-    def mock_parse(*args)
-      # exists just to be stubbed in tests
-      'command output'
-    end
-
-    def check_installation_and_config
-      unless command_exists?('docker')
-        fail('You need to install docker first with `sudo apt install docker`. After installation please log out and back in to your system once.')
-      end
-
-      unless command_exists?('docker-compose')
-        fail('You need to install docker-compose first with `sudo apt install docker-compose`.')
-      end
-
-      unless docker_compose_config && (services = docker_compose_config['services']) && services.key?('main')
-        fail('Your project does not seem to be properly set up. Expected to find a docker-compose.yml which defines a service named "main".')
-      end
-    end
-
-    def command_exists?(command)
-      execute(:system, "which #{command} > /dev/null")
-    end
-
-    def docker_compose_config
-      @docker_compose_config ||= if File.exists?(DOCKER_COMPOSE_FILE)
-        if YAML.respond_to?(:safe_load)
-          YAML.safe_load(File.read(DOCKER_COMPOSE_FILE))
-        else
-          YAML.load(File.read(DOCKER_COMPOSE_FILE))
-        end
-      end
-    rescue
-      false
-    end
-
-    def ssh_agent_forward
-      if (auth_sock = ENV['SSH_AUTH_SOCK'])
-        dirname = File.dirname(auth_sock)
-        ['-v', "#{dirname}:#{dirname}", '-e', "SSH_AUTH_SOCK=#{auth_sock}"]
-      else
-        []
-      end
-    end
-
-    def capture_stderr
-      old_stderr = $stderr.dup
-      io = Tempfile.new('cuc')
-      $stderr.reopen(io)
-      yield
-      io.rewind
-      io.read
-    ensure
-      io.close
-      io.unlink
-      $stderr.reopen(old_stderr)
-    end
-
-  end
-end