junit_model 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7bf4f754ab21c30fc0557d1c32eefc872cbe31
-  data.tar.gz: b5c44f1bce90ccc586e827e5ed7a94fc8653f959
+  metadata.gz: e8c2b889357cd9b0bdf627c03467ff4503880f42
+  data.tar.gz: c8b0076148a797a632098e61350c3ef58df9d31f
 SHA512:
-  metadata.gz: 050f4db4c9449661f95545bccbf210f1322027c65d08d2f1765015685110b4ebd0baa56081d19c39a0587aab3f69ec225e894846ac07c54257ae5b565032cba8
-  data.tar.gz: c5e8ed9dc9d34b4ba76a1fffd1039dff776466b2e636fcdb8f728c3c27f44877f3bcb817928c0b061514636c3c11bdb931205fe264b5c8ac5d57e0817a095f22
+  metadata.gz: 03052896a0b99f57cd00da88c28513b6670c628df0a2f6ad0240dccf353a9924ae1bb758d1a8ceb77ddcc94055c180d70d856acd31904d4fa6ee64362e93e2d9
+  data.tar.gz: 3af8922b6357c85d8b54bed9d88d924abcea38e7a10eda5decb279a195baa4376bbafa3c7b3397011834476be5fd19ec3e20666069c259dd8f26a3be6ab259bd

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
+  - 2.1.0
   - 2.2.0
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -3,6 +3,7 @@
 A nicer way to interact with JUnit xml files.
 
 [![Build Status](https://travis-ci.org/iainsmith/junit_model.svg?branch=master)](https://travis-ci.org/iainsmith/junit_model)
+[![Coverage Status](https://coveralls.io/repos/github/iainsmith/junit_model/badge.svg?branch=master)](https://coveralls.io/github/iainsmith/junit_model?branch=master)
 
 # Features
 

data/exe/junit_merge

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'junit_model'
+
+options = JunitModel::CLI::Parser.parse(ARGV)
+
+if options.files.count != 2
+  puts 'Failed: You must pass exactly 2 files to be merged'
+  exit
+end
+
+JunitModel::CLI::Merger.merge(options)

data/junit_model.gemspec

@@ -18,15 +18,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "xml-simple", "1.1.5"
-  spec.add_dependency "builder"
+  spec.add_dependency "xml-simple", "~> 1.1"
+  spec.add_dependency "builder", "~> 3.2"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "terminal-notifier"
   spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency "pry-remote"
   spec.add_development_dependency "guard-rubocop"
+  spec.add_development_dependency "coveralls"
+
+  spec.required_ruby_version = '>= 2.0'
 end

data/lib/junit_model.rb

@@ -3,6 +3,8 @@ require 'junit_model/parser'
 require 'junit_model/xml'
 require 'junit_model/merger'
 require 'junit_model/models'
+require 'junit_model/cli/cli_parser'
+require 'junit_model/cli/cli_merger'
 
 # Junit Model is here for good
 module JunitModel

data/lib/junit_model/cli/cli_merger.rb

@@ -0,0 +1,23 @@
+module JunitModel
+  module CLI
+    # Merge JUnit xml files from the command line
+    class Merger
+      def self.merge(options)
+        path_a = options.files[0]
+        path_b = options.files[1]
+        output_path = options.output_path
+
+        test_a = JunitModel::Parser.read_path(path_a)
+        test_b = JunitModel::Parser.read_path(path_b)
+
+        merged_tests = JunitModel::Merger.merge(test_a, test_b)
+        puts "Merged #{path_a} and #{path_b} to #{output_path}"
+        puts "Tests:#{merged_tests.tests} Failures:#{merged_tests.failure_count} Suites:#{merged_tests.test_suites.count}"
+        xml = merged_tests.to_xml
+        File.open(output_path, 'w') do |file|
+          file.write(xml)
+        end
+      end
+    end
+  end
+end

data/lib/junit_model/cli/cli_parser.rb

@@ -0,0 +1,40 @@
+require 'optparse'
+
+module JunitModel
+  module CLI
+    # The options to be used throughout the CLI Module
+    class Options
+      attr_accessor :files, :output_path
+      def initialize
+        self.files = []
+        self.output_path = './merged_tests.xml'
+      end
+    end
+
+    # Parse CLI::Options from ARGV
+    class Parser
+      def self.parse(argv)
+        options = Options.new
+        opt_parser = OptionParser.new do |opts|
+          opts.banner = 'Usage: example.rb [options]'
+
+          opts.on('-o', '--output OUTPUT', String, 'Output') do |n|
+            options.output_path = n
+          end
+
+          opts.on('-h', '--help', 'Prints this help') do
+            puts opts
+            exit
+          end
+        end
+
+        opt_parser.order(argv) do |file|
+          options.files << file unless file.nil?
+        end
+
+        opt_parser.parse(argv)
+        options
+      end
+    end
+  end
+end

data/lib/junit_model/merger.rb

@@ -46,7 +46,7 @@ module JunitModel
         classname: suite_a.name,
         tests: merged_test_cases.count.to_s,
         failures: failed_count.to_s,
-        test_cases: merged_test_cases
+        testcase: merged_test_cases
       )
     end
 

data/lib/junit_model/version.rb

@@ -1,3 +1,3 @@
 module JunitModel
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/junit_model/xml.rb

@@ -8,13 +8,19 @@ module JunitModel
       builder.instruct! :xml, version: '1.0', encoding: 'UTF-8'
       builder.testsuites(tests: result.test_count, failures: result.failures_count) do |suite_builder|
         result.test_suites.each do |suite|
-          suite_builder.testsuite(name: suite.name, tests: suite.tests, failures: suite.failures) do |test_builder|
+          suite_builder.testsuite(suite_hash(suite)) do |test_builder|
             suite.test_cases.each do |test_case|
-              test_builder.testcase(classname: test_case.classname, name: test_case.name, time: test_case.time)
+              test_builder.testcase(test_case.to_h)
             end
           end
         end
       end
     end
+
+    def self.suite_hash(suite)
+      suite_hash = suite.to_h
+      suite_hash.delete(:testcase)
+      suite_hash
+    end
   end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: junit_model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Iain Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,13 +150,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - iain@mountain23.com
-executables: []
+executables:
+- junit_merge
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -169,8 +185,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/junit_merge
 - junit_model.gemspec
 - lib/junit_model.rb
+- lib/junit_model/cli/cli_merger.rb
+- lib/junit_model/cli/cli_parser.rb
 - lib/junit_model/merger.rb
 - lib/junit_model/models.rb
 - lib/junit_model/parser.rb
@@ -188,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -201,4 +220,3 @@ signing_key:
 specification_version: 4
 summary: A nicer way to deal with JUnit style xml
 test_files: []
-has_rdoc: