hiptest-publisher 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308eed4579db33eb3a66d88a1fedf85cc54623a1
-  data.tar.gz: a9b55d5bc2b3e77b6250980b7d62670e19d3dfc2
+  metadata.gz: e40f7305d2e457cf777c7f466dce10615f038da0
+  data.tar.gz: 707eb0e73db074cbeeb34784ac7d5d207e6c511c
 SHA512:
-  metadata.gz: 16692815eb3cdb3e8f7646225b703bd151b838d9c113120d1f284fe569cdef883df6750a12af79942fe6fb087f7a92da7cb5e76bbd170d1c6e951c06be910c90
-  data.tar.gz: 76b30324fdb46dd38dd10f5bee979f4fc895a61120390fdd00645609b8dc60c2045919195b5bd1d390516808f119da10157e59b8069bdd0957bb1f13fc0ae0ac
+  metadata.gz: 3e0e0305db5ff2e4a381cdce686f147b76c1f6cce72f02cccd04874184382d1328e65a30e1b6c3cbc7103230228f773254587cee1ef62e83bca51c2d9f1e0790
+  data.tar.gz: 11281106ec92a89cbccb1129f3e72185bdce7aa886d09f0a7f427f62726d50172ec0641e122898862c555955747fe9efc9817cd6f36add76eed16a9b1d08fb8f

data/lib/hiptest-publisher.rb

@@ -12,6 +12,8 @@ require 'hiptest-publisher/parameter_type_adder'
 require 'hiptest-publisher/call_arguments_adder'
 require 'hiptest-publisher/signature_exporter'
 require 'hiptest-publisher/signature_differ'
+require 'hiptest-publisher/items_orderer'
+
 
 module Hiptest
   class Publisher
@@ -235,6 +237,7 @@ module Hiptest
         Hiptest::Nodes::ParameterTypeAdder.add(@project)
         Hiptest::DefaultArgumentAdder.add(@project)
         Hiptest::GherkinAdder.add(@project)
+        Hiptest::ItemsOrderer.add(@project, @cli_options.sort)
       end
 
       export_files

data/lib/hiptest-publisher/items_orderer.rb

@@ -0,0 +1,29 @@
+require 'hiptest-publisher/nodes'
+
+module Hiptest
+  class ItemsOrderer
+    def self.add(project, order)
+      Hiptest::ItemsOrderer.new(project).order_items(order)
+    end
+
+    def initialize(project)
+      @project = project
+    end
+
+    def order_items(order)
+      if (order == 'order')
+        @project.each_sub_nodes(Hiptest::Nodes::Folder) do |folder|
+          folder.children[:scenarios].sort_by! {|sc| sc.order_in_parent}
+          folder.children[:subfolders].sort_by! {|f| f.order_in_parent}
+        end
+      end
+
+      if (order == 'alpha')
+        @project.each_sub_nodes(Hiptest::Nodes::Folder) do |folder|
+          folder.children[:scenarios].sort_by! {|sc| sc.children[:name] }
+          folder.children[:subfolders].sort_by! {|f| f.children[:name] }
+        end
+      end
+    end
+  end
+end

data/lib/hiptest-publisher/nodes.rb

@@ -268,14 +268,15 @@ module Hiptest
     end
 
     class Scenario < Item
-      attr_reader :folder_uid
+      attr_reader :folder_uid, :order_in_parent
 
-      def initialize(name, description = '', tags = [], parameters = [], body = [], folder_uid = nil, datatable = Datatable.new)
+      def initialize(name, description = '', tags = [], parameters = [], body = [], folder_uid = nil, datatable = Datatable.new, order_in_parent = 0)
         super(name, tags, parameters, body)
         @children[:description] = description
         @children[:datatable] = datatable
 
         @folder_uid = folder_uid
+        @order_in_parent = order_in_parent
       end
 
       def set_uid(uid)
@@ -382,13 +383,14 @@ module Hiptest
     end
 
     class Folder < Node
-      attr_reader :uid, :parent_uid
+      attr_reader :uid, :parent_uid, :order_in_parent
 
-      def initialize(uid, parent_uid, name, description, tags = [])
+      def initialize(uid, parent_uid, name, description, tags = [], order_in_parent = 0)
         super()
 
         @uid = uid
         @parent_uid = parent_uid
+        @order_in_parent = order_in_parent
 
         @children = {
           :name => name,

data/lib/hiptest-publisher/options_parser.rb

@@ -156,6 +156,7 @@ class OptionsParser
       Option.new('s', 'site=SITE', 'https://hiptest.net', String, "Site to fetch from", :site),
       Option.new('p', 'push=FILE.TAP', '', String, "Push a results file to the server", :push),
       Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (tap, junit, robot)", :push_format),
+      Option.new(nil, 'sort=[id,order,alpha]', 'id', String, "Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest, alpha will sort them by name", :sort),
       Option.new('v', 'verbose', false, nil, "Run verbosely", :verbose)
     ]
   end

data/lib/hiptest-publisher/xml_parser.rb

@@ -208,7 +208,8 @@ module Hiptest
         build_parameters(scenario),
         build_steps(scenario),
         css_first_content(scenario, '> folderUid'),
-        build_node(css_first(scenario, '> datatable'), Hiptest::Nodes::Datatable))
+        build_node(css_first(scenario, '> datatable'), Hiptest::Nodes::Datatable),
+        css_first_content(scenario, 'order_in_parent').to_i)
     end
 
     def build_scenarioSnapshot(scs)
@@ -273,7 +274,8 @@ module Hiptest
         css_first_content(folder, 'parentUid'),
         css_first_content(folder, 'name'),
         css_first_content(folder, 'description'),
-        build_tags(folder))
+        build_tags(folder),
+        css_first_content(folder, 'order_in_parent').to_i)
     end
     alias :build_folderSnapshot :build_folder
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -262,6 +262,7 @@ files:
 - lib/hiptest-publisher/formatters/reporter.rb
 - lib/hiptest-publisher/gherkin_adder.rb
 - lib/hiptest-publisher/handlebars_helper.rb
+- lib/hiptest-publisher/items_orderer.rb
 - lib/hiptest-publisher/nodes.rb
 - lib/hiptest-publisher/nodes_walker.rb
 - lib/hiptest-publisher/options_parser.rb
@@ -576,7 +577,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.