geordi 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58c675d81b07400a5d816bc1191ef4ea26a010395379a3e1e103130fa0edd14
-  data.tar.gz: 85a7a4a397ed51b174468b1a9f8005d9dec37a2e35ab2c765b41eb01ddbf6052
+  metadata.gz: 31205050856b6cbf1da091aa848188eb443b448ba6fb082f80d47f4cfc155bff
+  data.tar.gz: 683b5faf93216db73bb6196c3f3317676a9c3ac83e72628c7c91e143ace59528
 SHA512:
-  metadata.gz: aebd6912385505c157d89cda5d81f78e2f35fc172e081690832b824d4d162745c4c415b1b28fc100a0aad83623d6c91e5bbcc87f7613e3079d2260d16e0ca591
-  data.tar.gz: 9afd1e6b056e881fc7ad0ee13182d72ee3bb35ca34672935183a225efe850f1a42ac090df9f45722ec062d4d212a926e93cba5964ab704b1903e6c6c743339e5
+  metadata.gz: 7e49a4315b8a5bafe6d00c433c63745ba0e7bb09db7f2293dd5c3940a0a89bc40b3fdbcc3b48b589d22037f813d6948d5a54ad779afb2452515af9f1dd9c28e4
+  data.tar.gz: 914bbb568c721c19b6ca13521f9bb87c3bdc2fd2817cda7c7cdb0185cc72c937169eb5bc0c5be366d5d3365a347460d9b13ca9d108df1c1fef88c7f9fae58df7

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+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
+
+## 1.10.0 2018-10-17
+
+### Compatible changes
+- Fixes [#44](https://github.com/makandra/geordi/issues/44): Geordi now supports a multiline server definition.
+
+  Example:
+
+  ```
+  server 'c01.test.example.com',
+    user: 'deploy-test_p',
+    roles: ['app', 'web', 'db', 'cron', 'primary_cron'],
+    primary: true
+  ```
+
+- Added this CHANGELOG file.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (1.9.1)
+    geordi (1.10.0)
       thor (>= 0.18.0)
 
 GEM
@@ -62,4 +62,4 @@ DEPENDENCIES
   rspec-mocks
 
 BUNDLED WITH
-   1.16.1
+   1.16.5

data/README.md

@@ -367,7 +367,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 readme`.
+by `rake readme`. Also remember to add your changes to the CHANGELOG.
 
 Geordi is (partially) tested with Cucumber and Aruba. Run all tests with `rake`.
 Of course you're free to use `geordi tests` ;)

data/features/shell.feature

@@ -28,3 +28,15 @@ Feature: The shell command
 
     When I run `geordi shell geordi`
     Then the output should contain "Util.system! ssh, deploy@first.example.com, -t, cd /var/www/example.com/current && bash --login"
+
+  Scenario: It allows multiline capistrano server definitions
+    Given a file named "config/deploy.rb" with "deploy.rb exists"
+    And a file named "config/deploy/geordi.rb" with:
+    """
+    set :deploy_to, '/var/www/example.com'
+    server 'first.example.com',
+      user: 'deploy'
+    """
+
+    When I run `geordi shell geordi`
+    Then the output should contain "Util.system! ssh, deploy@first.example.com, -t, cd /var/www/example.com/current && bash --login"

data/lib/geordi/capistrano_config.rb

@@ -11,7 +11,7 @@ module Geordi
 
     def user(server)
       cap2user = deploy_info[ /^set :user, ['"](.*?)['"]/, 1 ]
-      cap2user || deploy_info[ /^server ['"]#{ server }['"],.*user.{1,4}['"](.*?)['"]/, 1 ]
+      cap2user || deploy_info[ /^server ['"]#{ server }['"],.*user.{1,4}['"](.*?)['"]/m, 1 ]
     end
 
     def servers

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.9.1'
+  VERSION = '1.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -51,6 +51,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE