rox-client-rspec 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTNlNmE4ZTM2MjhmZDg1M2VlMWI3NDM1NTE2NzhhYTgzYmZjYTNkNQ==
+    YzNhOWE3OTM3ZGQxNTEzZWE4YmE2ODQ1NWFmZGE4ODE0NDM3MzZiZQ==
   data.tar.gz: !binary |-
-    MjlmNTViYTI1OWMzOTQ1M2QyNzcwOTRiNThhNTM2ZGVhOTdjMTQ2Yg==
+    Y2Q5MGU2ZmMzM2NkM2VjMzZiYTNlOTJkYTYwMzFiNzM5YzIyOTFhNA==
 SHA512:
   metadata.gz: !binary |-
-    N2FjYWE5ZTI3NjRkODM0NGFmNDc5Mjk5OGM5Yjg0MzkyMzY2NTEzMmExYWFm
-    ZmY4ZDk4ZTRjMzBkZDg0YzQ0NjUyZjlkMmYzNWJjYTBkMDFmYzFmNmU3MzQ1
-    NzZmMWIwZGUxMWIwYTg4NWIyZDRmNDhmNTljZWRiMGE5N2RjMDc=
+    YzRkN2E5OTcyNTE0MTczMTMyYjhkOGY1NDg1ODFjMzA2MzU4OTRkYjQ1NWY2
+    OGUxNWFhMWI0MzdkZjBmNzk1NmZjMDYzMzhkZDJiOWFlN2Q2MGFmMzgyOWY2
+    OGY3Mjk4Nzc1NzhhOWI4ZWJkNDMwMzJhN2YxZjU2Y2E1YjU2NzE=
   data.tar.gz: !binary |-
-    Y2U2OTQ0M2Y2YTE5ODBlYjI3NmM2MDUxMTA3M2RiZTM2M2VhMzhiOTcxZjVh
-    YjQ5YjFjN2EyYjA0MjliZWQ3M2ZlMzQ0YzcwYTZlZjE2OGU4ZDBhYzY1MWNm
-    NzJiY2IzZGM5NTEwZTU0NTQ1YWZlYjZiZmIwMTkxYzFiODRhMGU=
+    OGJjNTk5YzQ1YjExZTQ0ZmJhZDMyMjI2YmM2ZjlkOWI0ZTAzNmQwZDQ1NmRk
+    MTI3NzUzZWY3MzAyNzNkOWNkY2EzYmI1OTExOGZjYzU5ZDE1ZmFjM2ExMmJj
+    OTcxNmM3ZWFiOTZjZGZkZjgzN2E3MzU1NGZjMjZkYjM1NzA4Y2M=

data/README.md

@@ -49,7 +49,7 @@ In your home folder, you must create the `~/.rox/config.yml` configuration file.
 ```yml
 # List of ROX Center servers you can submit test results to.
 servers:
-  - name: rox.example.com                 # A custom name for your ROX Center server.
+  rox.example.com:                        # A custom name for your ROX Center server.
                                           # You will use this in the client configuration file.
                                           # We recommend using the domain name where you deployed it.
 
@@ -71,9 +71,8 @@ In the project directory where you run RSpec, you must add the `rox.yml` client
 ```yml
 # Configuration specific to your project.
 project:
-  name: My Project
-  version: 1.2.3
   apiId: 154sic93pxs0   # The API key of your project in the ROX Center server.
+  version: 1.2.3
 
 # Where the client should store its temporary files.
 # The client will work without it but it is required for some advanced features.
@@ -121,28 +120,9 @@ The next time you run your test suite, the RSpec ROX Client will send the result
 * Push to your branch - `git push origin my_feature`
 * Create a [pull request](http://help.github.com/pull-requests/) from your branch
 
-Please add a changelog entry with your name for new features and bug fixes.
+Please add a [changelog](CHANGELOG.md) entry with your name for new features and bug fixes.
 
 ## License
 
 The RSpec ROX Client is licensed under the [MIT License](http://opensource.org/licenses/MIT).
-
-    Copyright (c) 2012-2013 Lotaris SA
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
+See [LICENSE.txt](LICENSE.txt) for the full license.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rox-client-rspec.rb

@@ -4,7 +4,7 @@ require 'rspec'
 module RoxClient
 
   module RSpec
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
 
     class Error < StandardError; end
     class PayloadError < Error; end

data/lib/rox-client-rspec/config.rb

@@ -92,25 +92,12 @@ module RoxClient::RSpec
 
     def build_servers config
 
-      servers = {}
-
       default_server_options = { project_api_id: config[:project][:api_id] }
-      config[:servers].each do |server_options|
-
-        name = server_options[:name].to_s.strip
-        if name.empty?
-          @load_warnings << "Ignoring unnamed server"
-          next
-        elsif servers[name]
-          servers[name].merge! server_options
-          next
-        end
-
-        servers[name] = server_options
+      servers = config[:servers].inject({}) do |memo,(name, options)|
+        memo[name] = Server.new default_server_options.merge(options).merge(name: name)
+        memo
       end
 
-      servers.each_key{ |name| servers[name] = Server.new default_server_options.merge(servers[name]) }
-
       [ servers.values, servers[@server_name.to_s.strip] ]
     end
 
@@ -126,11 +113,20 @@ module RoxClient::RSpec
 
       actual_configs.collect!{ |f| YAML.load_file f }
 
-      actual_configs.inject({}) do |memo,yml|
+      actual_configs.inject({ servers: {} }) do |memo,yml|
         memo.merge! parse_general_options(yml)
-        memo[:servers] = (memo[:servers] || []) + (yml['servers'].kind_of?(Array) ? yml['servers'].collect{ |s| parse_server_options s } : [])
+
+        if yml['servers'].kind_of? Hash
+          yml['servers'].each_pair do |k,v|
+            if v.kind_of? Hash
+              memo[:servers][k] = (memo[:servers][k] || {}).merge(parse_server_options(v))
+            end
+          end
+        end
+
         memo[:payload] = (memo[:payload] || {}).merge parse_payload_options(yml['payload'])
         memo[:project] = (memo[:project] || {}).merge parse_project_options(yml['project'])
+
         memo
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rox-client-rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Simon Oulevay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: RSpec extensions to send results to ROX Center.