allure-rspec 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fec41921ea99be5dcbb621773501e81924dd2905
-  data.tar.gz: bfc84fc1048ed36b8c105fa9bbd1766aea1f6db8
+  metadata.gz: 76c5c9a1660e8ae8746b73e8fa6111c6261aa607
+  data.tar.gz: 8b5820b53d091ce34e3474d44ce65f3afb790fa3
 SHA512:
-  metadata.gz: bfd123e24dd44780765cb33b997737e1358d6581c8342d9434b150b15fb704f29ef71ee914052d9f3196661b23dbb43905142c0803526a696cca1d40ca6f3199
-  data.tar.gz: a7a649563839b91797810b8ed3d93f11c868d4b3f9f65f463c1dfb7b43996f6ecdb2d001e09859db5e31e658be672cd9b94a73efb719f70bedfe24f789b46f83
+  metadata.gz: b6c27669cf4e08e0c9095075931741c8a2cead92b037467837e2dd864b34dcd3864c9ed057fbc5005dfd1b0fa8e84ea9cd962259d2677884440fc6dde66337ee
+  data.tar.gz: 56d2544deeef8891b7bb37e5d105369eafece2959178ce8b9407b6ccec1892723aea9602166caae5f3bf58f81ee0328d731751d3fb8e5065cfec9f951ae1ec8f

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 gem 'rspec', '~> 2.13.0'
 gem 'nokogiri', '~> 1.6.0'
+gem 'mimemagic'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    allure-rspec (0.1)
+    allure-rspec (0.3)
+      mimemagic
       nokogiri (~> 1.6.0)
       rspec (~> 2.13.0)
       uuid
@@ -10,8 +11,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
+    macaddr (1.7.1)
+      systemu (~> 2.6.2)
+    mimemagic (0.2.1)
     mini_portile (0.5.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
@@ -24,7 +26,7 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    systemu (2.5.2)
+    systemu (2.6.4)
     uuid (2.3.7)
       macaddr (~> 1.0)
 
@@ -34,6 +36,7 @@ PLATFORMS
 DEPENDENCIES
   allure-rspec!
   bundler
+  mimemagic
   nokogiri (~> 1.6.0)
   rake
   rspec (~> 2.13.0)

data/README.md

@@ -2,6 +2,10 @@
 
 Adaptor to use the Allure framework along with the RSpec
 
+## What's new
+
+* *0.3* - Allure 1.4.0 format support.
+
 ## Setup
 
 Add the dependency to your Gemfile

data/allure-model.xsd

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:qa="urn:model.allure.qatools.yandex.ru"
+           targetNamespace="urn:model.allure.qatools.yandex.ru">
+
+    <xs:element name="test-suite" type="qa:test-suite-result"/>
+
+    <xs:complexType name="test-suite-result">
+        <xs:all>
+            <xs:element name="name" type="xs:string"/>
+            <xs:element name="title" type="xs:string" minOccurs="0"/>
+            <xs:element name="description" type="qa:description" minOccurs="0"/>
+            <xs:element name="test-cases" type="qa:test-cases-result" minOccurs="0"/>
+            <xs:element name="labels" type="qa:labels" minOccurs="0"/>
+        </xs:all>
+        <xs:attribute name="start" type="xs:long" use="required"/>
+        <xs:attribute name="stop" type="xs:long" use="required"/>
+        <xs:attribute name="version" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:complexType name="test-cases-result">
+        <xs:sequence>
+            <xs:element name="test-case" type="qa:test-case-result" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="test-case-result">
+        <xs:all>
+            <xs:element name="name" type="xs:string"/>
+            <xs:element name="title" type="xs:string" minOccurs="0"/>
+            <xs:element name="description" type="qa:description" minOccurs="0"/>
+            <xs:element name="failure" type="qa:failure" minOccurs="0"/>
+            <xs:element name="steps" type="qa:steps" minOccurs="0"/>
+            <xs:element name="attachments" type="qa:attachments" minOccurs="0"/>
+            <xs:element name="labels" type="qa:labels" minOccurs="0"/>
+            <xs:element name="parameters" type="qa:parameters" minOccurs="0"/>
+        </xs:all>
+        <xs:attribute name="start" type="xs:long" use="required"/>
+        <xs:attribute name="stop" type="xs:long" use="required"/>
+        <xs:attribute name="status" type="qa:status" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="steps">
+        <xs:sequence>
+            <xs:element name="step" type="qa:step" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="step">
+        <xs:all>
+            <xs:element name="name" type="xs:string"/>
+            <xs:element name="title" type="xs:string" minOccurs="0"/>
+            <xs:element name="attachments" type="qa:attachments" minOccurs="0"/>
+            <xs:element name="steps" type="qa:steps" minOccurs="0"/>
+        </xs:all>
+        <xs:attribute name="start" type="xs:long" use="required"/>
+        <xs:attribute name="stop" type="xs:long" use="required"/>
+        <xs:attribute name="status" type="qa:status" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="failure">
+        <xs:all>
+            <xs:element name="message" type="xs:string"/>
+            <xs:element name="stack-trace" type="xs:string" minOccurs="0"/>
+        </xs:all>
+    </xs:complexType>
+
+    <xs:complexType name="labels">
+        <xs:sequence>
+            <xs:element name="label" type="qa:label" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="label">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="value" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="parameters">
+        <xs:sequence>
+            <xs:element name="parameter" type="qa:parameter" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="parameter">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="value" type="xs:string" use="required"/>
+        <xs:attribute name="kind" type="qa:parameter-kind" use="required"/>
+    </xs:complexType>
+
+    <xs:simpleType name="parameter-kind">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="argument"/>
+            <xs:enumeration value="system-property"/>
+            <xs:enumeration value="environment-variable"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:complexType name="attachments">
+        <xs:sequence>
+            <xs:element name="attachment" type="qa:attachment" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="attachment">
+        <xs:attribute name="title" type="xs:string" use="required"/>
+        <xs:attribute name="source" type="xs:string" use="required"/>
+        <xs:attribute name="type" type="xs:string" use="required"/>
+        <xs:attribute name="size" type="xs:int"/>
+    </xs:complexType>
+
+    <!--Deprecated, will be removed in 1.4.0-->
+    <xs:simpleType name="attachment-type">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="txt"/>
+            <xs:enumeration value="html"/>
+            <xs:enumeration value="xml"/>
+            <xs:enumeration value="png"/>
+            <xs:enumeration value="jpg"/>
+            <xs:enumeration value="json"/>
+            <xs:enumeration value="other"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="status">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="failed"/>
+            <xs:enumeration value="broken"/>
+            <xs:enumeration value="passed"/>
+            <xs:enumeration value="canceled"/>
+            <xs:enumeration value="pending"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="label-name">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="feature"/>
+            <xs:enumeration value="story"/>
+            <xs:enumeration value="severity"/>
+            <xs:enumeration value="language"/>
+            <xs:enumeration value="framework"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="severity-level">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="blocker"/>
+            <xs:enumeration value="critical"/>
+            <xs:enumeration value="normal"/>
+            <xs:enumeration value="minor"/>
+            <xs:enumeration value="trivial"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:complexType name="description">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="type" type="qa:description-type" default="text"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:simpleType name="description-type">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="markdown"/>
+            <xs:enumeration value="text"/>
+            <xs:enumeration value="html"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>

data/allure-rspec.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rspec', '~> 2.13.0'
   s.add_dependency 'nokogiri', '~> 1.6.0'
   s.add_dependency 'uuid'
+  s.add_dependency 'mimemagic'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/lib/allure-rspec/builder.rb

@@ -81,6 +81,7 @@ module AllureRSpec
             :title => attachment[:title],
             :source => attachment[:source],
             :type => attachment[:type],
+            :size => attachment[:size],
         }
         if step.nil?
           self.suites[suite][:tests][test][:attachments] << attach
@@ -112,28 +113,40 @@ module AllureRSpec
       def each_suite_build(&block)
         suites_xml = []
         self.suites.each do |suite_title, suite|
-          builder = Nokogiri::XML::Builder.new do
-            send "test-suite", :start => suite[:start] || 0, :stop => suite[:stop] || 0 do
-              title suite_title
-              suite[:tests].each do |test_title, test|
-                send "test-cases", :start => test[:start] || 0, :stop => test[:stop] || 0, :status => test[:status], :severity => test[:severity] do
-                  title test_title
-                  unless test[:failure].nil?
-                    failure do
-                      message test[:failure][:message]
-                      send "stack-trace", test[:failure][:stacktrace]
+          builder = Nokogiri::XML::Builder.new do |xml|
+            xml.send "ns2:test-suite", :start => suite[:start] || 0, :stop => suite[:stop] || 0, 'xmlns' => '', "xmlns:ns2" => "urn:model.allure.qatools.yandex.ru" do
+              xml.send "name", suite_title
+              xml.send "test-cases" do
+                suite[:tests].each do |test_title, test|
+                  xml.send "test-case", :start => test[:start] || 0, :stop => test[:stop] || 0, :status => test[:status] do
+                    xml.send "name", test_title
+                    unless test[:failure].nil?
+                      xml.failure do
+                        xml.message test[:failure][:message]
+                        xml.send "stack-trace", test[:failure][:stacktrace]
+                      end
                     end
-                  end
-                  test[:steps].each do |step_title, step_obj|
-                    steps(:start => step_obj[:start] || 0, :stop => step_obj[:stop] || 0, :status => step_obj[:status]) do
-                      title step_title
-                      step_obj[:attachments].each do |attach|
-                        attachment :source => attach[:source], :title => attach[:title], :type => attach[:type]
+                    xml.steps do
+                      test[:steps].each do |step_title, step_obj|
+                        xml.step(:start => step_obj[:start] || 0, :stop => step_obj[:stop] || 0, :status => step_obj[:status]) do
+                          xml.send "name", step_title
+                          xml.attachments do
+                            step_obj[:attachments].each do |attach|
+                              xml.attachment :source => attach[:source], :title => attach[:title], :size => attach[:size], :type => attach[:type]
+                            end
+                          end
+                        end
                       end
                     end
-                  end
-                  test[:attachments].each do |attach|
-                    attachment :source => attach[:source], :title => attach[:title], :type => attach[:type]
+                    xml.attachments do
+                      test[:attachments].each do |attach|
+                        xml.attachment :source => attach[:source], :title => attach[:title], :size => attach[:size], :type => attach[:type]
+                      end
+                    end
+                    xml.labels do
+                      xml.label :name => "severity", :value => test[:severity]
+                    end
+                    xml.parameters
                   end
                 end
               end

data/lib/allure-rspec/dsl.rb

@@ -1,3 +1,5 @@
+require 'digest'
+require 'mimemagic'
 module AllureRSpec
   module DSL
 
@@ -33,12 +35,20 @@ module AllureRSpec
 
     def attach_file(title, file)
       step = __current_step
+      dir = Pathname.new(AllureRSpec::Config.output_dir)
+      FileUtils.mkdir_p(dir)
+      file_extname = File.extname(file.path.downcase)
+      type = MimeMagic.by_path(file.path) || "text/plain"
+      attachment = dir.join("#{Digest::SHA256.file(file.path).hexdigest}-attachment#{(file_extname.empty?) ? '' : file_extname}")
+      FileUtils.cp(file.path, attachment)
       suite = self.example.metadata[:example_group][:description_args].first
       test = self.example.metadata[:description]
-      type = :other
-      file_extname = File.extname(file.path.downcase)
-      type = file_extname if ALLOWED_ATTACH_EXTS.include?(file_extname)
-      AllureRSpec::Builder.add_attachment(suite, test, {:type => type, :title => title, :source => file.path}, step)
+      AllureRSpec::Builder.add_attachment(suite, test, {
+          :type => type,
+          :title => title,
+          :source => attachment.basename,
+          :size => File.stat(attachment).size
+      }, step)
     end
   end
 end

data/lib/allure-rspec/formatter.rb

@@ -45,14 +45,26 @@ module AllureRSpec
       super
     end
 
+    def start(example_count)
+      dir = Pathname.new(AllureRSpec::Config.output_dir)
+      FileUtils.rm_rf(dir)
+    end
+
     def stop
       AllureRSpec::Builder.each_suite_build do |suite, xml|
         dir = Pathname.new(AllureRSpec::Config.output_dir)
-        FileUtils.rm_rf(dir)
         FileUtils.mkdir_p(dir)
-        File.open(dir.join("#{UUID.new.generate}.xml"), 'w+') do |file|
+        out_file = dir.join("#{UUID.new.generate}.xml")
+        File.open(out_file, 'w+') do |file|
           file.write(xml)
         end
+
+        #xsd = Nokogiri::XML::Schema(File.read("allure-model.xsd"))
+        #doc = Nokogiri::XML(File.read(out_file))
+        #
+        #xsd.validate(doc).each do |error|
+        #  puts error.message
+        #end
       end
       super
     end

data/lib/allure-rspec/version.rb

@@ -1,5 +1,5 @@
 module AllureRSpec # :nodoc:
   module Version # :nodoc:
-    STRING = '0.2'
+    STRING = '0.3'
   end
 end

data/spec/extend_steps_spec.rb

@@ -9,13 +9,13 @@ describe AllureRSpec do
     end
 
     step "step2" do
-
+      attach_file "logo", File.new("logo.png")
       5.should be > 1
     end
 
     step "step3" do
 
-      0.should == 0
+      0.should == 1
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-rspec
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Ilya Sadykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- allure-model.xsd
 - allure-rspec.gemspec
 - lib/allure-rspec.rb
 - lib/allure-rspec/adaptor.rb
@@ -98,6 +113,7 @@ files:
 - lib/allure-rspec/dsl.rb
 - lib/allure-rspec/formatter.rb
 - lib/allure-rspec/version.rb
+- logo.png
 - spec/extend_steps_spec.rb
 - spec/spec_helper.rb
 homepage: http://allure.qatools.ru
@@ -123,5 +139,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: allure-rspec-0.2
+summary: allure-rspec-0.3
 test_files: []