thinp_xml 0.0.20 → 0.0.24

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODJiYjEzNzNmYzhmYzMwMzY0MDcxNjE2NzYzYWQyODMxMTMxYjUyNQ==
-  data.tar.gz: !binary |-
-    ODAwOWQxNWIwZGVhMWUyN2U3M2ZlOThjMDNiYTc2MWQ2ZTZkNWQ2ZQ==
+SHA1:
+  metadata.gz: d6f915ce43b16825c99f62bfd2ff3c69431b1228
+  data.tar.gz: 80ca4400ac41dbda0941f081f637a3b52c00929c
 SHA512:
-  metadata.gz: !binary |-
-    M2NhZjdjNzQ3ZGQ5Y2M4YTRhNjlmYjE4YThkNDc1NDNjNTNiNWFkNTFkODZk
-    ZjQ0MDEwMDlhYjNhYTE1NDE4NzZjZjg3OTRiZDgyYmNjZDkyYjA4NjIyMWEz
-    NmYyYjAzNDExYWU2NWM3MWI3ZDQwYzI1ODEwMjQ1NDY1NDMxZjI=
-  data.tar.gz: !binary |-
-    ZmEyNzVkNzYzZjFiMzBiNmMwZjY5NDg2NWQ2NDc3N2I4NzUzOGNhNGM4ZjEz
-    MWNkMzAyZTVmYmRiYjBmNzhhMjg3Nzk0ZTUyN2Q4NTM1NjAyNWM5YTQ5ZmQ4
-    ZDQ1NDAxMjVkYjRlZmFiYmM5N2ViM2UzNjM2ZDkxZTljMDEzNTY=
+  metadata.gz: 9a68908cca82127b90634793b9ea52cd2914c88b2d0c710cfce2309847a6fa5a274c1a991ee3962f0f15439ca2b97a9cdb6afb7223005c4ed008742e40676c24
+  data.tar.gz: fd674d1b2e80fc8e04753e85fca5b92259a7d9862414cefc1998d950951f819b470b5e375ec2b14d9df2e3a42a8dcf5b13174cb753d125c8914f6cdd7c5df4ac

data/.gitignore

@@ -1,4 +1,5 @@
 *~
+*.swp
 *.gem
 *.rbc
 .bundle

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/features/step_definitions/thinp_xml.rb

@@ -1,20 +1,20 @@
 When(/^I thinp_xml (.*)$/) do |cmd|
-  run_simple(unescape("thinp_xml #{cmd}"), false)
+  run_simple(sanitize_text("thinp_xml #{cmd}"), false)
 end
 
 When(/^I cache_xml (.*)$/) do |cmd|
-  run_simple(unescape("cache_xml #{cmd}"), false)
+  run_simple(sanitize_text("cache_xml #{cmd}"), false)
 end
 
 When(/^I era_xml (.*)$/) do |cmd|
-  run_simple(unescape("era_xml #{cmd}"), false)
+  run_simple(sanitize_text("era_xml #{cmd}"), false)
 end
 
 Then(/^it should pass$/) do
-  assert_success(true)
+	expect(last_command_started).to be_successfully_executed
 end
 
 Then(/^it should fail$/) do
-  assert_success(false)
+	expect(last_command_started).to_not be_successfully_executed
 end
 

data/lib/thinp_xml.rb

@@ -1,5 +1,5 @@
 module ThinpXML
-  THINP_TOOLS_VERSION = '0.1.5'
+  THINP_TOOLS_VERSION = '0.7'
 
   def self.tools_are_installed
     true

data/lib/thinp_xml/cache/builder.rb

@@ -72,7 +72,7 @@ module CacheXML
 
     def nr_mappings=(n)
       n = n.to_i
-      #raise "nr_mappings must not exceed nr_cache_blocks" if n > @nr_cache_blocks
+      raise "nr_mappings must not exceed nr_cache_blocks" if n > @nr_cache_blocks
       @nr_mappings = n
     end
 

data/lib/thinp_xml/era_xml.rb

@@ -1,4 +1,5 @@
 require 'thinp_xml/era/builder'
 require 'thinp_xml/era/emit'
 require 'thinp_xml/era/metadata'
+require 'thinp_xml/era/parse'
 require 'thinp_xml/version'

data/lib/thinp_xml/thinp/builder.rb

@@ -18,7 +18,7 @@ module ThinpXML
 
       mapping_counts = (0..nr_thins - 1).map {|n| @nr_mappings.to_i}
       nr_data_blocks = mapping_counts.inject(0) {|n, tot| n + tot}
-      superblock = Superblock.new(@uuid, 0, 1, @block_size, nr_data_blocks)
+      superblock = Superblock.new(@uuid, 0, 1, 0, 2, @block_size, nr_data_blocks)
 
       devices = Array.new
       offset = 0

data/lib/thinp_xml/thinp/emit.rb

@@ -11,7 +11,7 @@ module ThinpXML
       end
 
       def emit_superblock(sb, &block)
-        @e.emit_tag(sb, 'superblock', :uuid, :time, :transaction, :data_block_size, :nr_data_blocks, &block)
+        @e.emit_tag(sb, 'superblock', :uuid, :time, :transaction, :flags, :version, :data_block_size, :nr_data_blocks, &block)
       end
 
       def emit_device(dev, &block)

data/lib/thinp_xml/thinp/metadata.rb

@@ -2,6 +2,8 @@ module ThinpXML
   SUPERBLOCK_FIELDS = [[:uuid, :string],
                        [:time, :int],
                        [:transaction, :int],
+											 [:flags, :int],
+											 [:version, :int],
                        [:data_block_size, :int],
                        [:nr_data_blocks, :int]]
 

data/lib/thinp_xml/thinp/xml_format.rb

@@ -12,6 +12,8 @@ module XMLFormat
 
   SUPERBLOCK_FIELDS = [[:uuid, :string],
                        [:time, :int],
+											 [:flags, :int],
+											 [:version, :int],
                        [:transaction, :int],
                        [:data_block_size, :int],
                        [:nr_data_blocks, :int]]
@@ -144,7 +146,7 @@ module XMLFormat
   end
 
   def emit_superblock(e, sb, &block)
-    e.emit_tag(sb, 'superblock', :uuid, :time, :transaction, :data_block_size, :nr_data_blocks, &block)
+    e.emit_tag(sb, 'superblock', :uuid, :time, :transaction, :flags, :version, :data_block_size, :nr_data_blocks, &block)
   end
 
   def emit_device(e, dev, &block)

data/lib/thinp_xml/version.rb

@@ -1,3 +1,3 @@
 module ThinpXml
-  VERSION = "0.0.20"
+  VERSION = "0.0.24"
 end

data/spec/builder_spec.rb

@@ -1,4 +1,5 @@
 require 'thinp_xml/thinp/builder'
+require 'thinp_xml/distribution'
 
 #----------------------------------------------------------------
 
@@ -69,7 +70,7 @@ describe "ThinpXML::Builder" do
     end
 
     it "should take a distribution" do
-      @b.nr_thins = UniformDistribution.new(2, 6)
+      @b.nr_thins = ThinpXML::UniformDistribution.new(2, 6)
       md = @b.generate
 
       expect(md.devices.size).to be <= 5

data/spec/cache_parse_spec.rb

@@ -26,7 +26,7 @@ EOF
 describe "CacheXML::read_xml" do
   # a sanity check (debugging some namespace issues)
   it "should work" do
-    read_xml(StringIO.new(INPUT))
+    CacheXML::read_xml(StringIO.new(INPUT))
   end
 end
 

data/spec/era_parse_spec.rb

@@ -6,7 +6,7 @@ include EraXML
 
 describe "EraXML::read_xml" do
   it "should handle metadata with zero blocks" do
-    metadata = read_xml(StringIO.new(<<EOF))
+    metadata = EraXML::read_xml(StringIO.new(<<EOF))
 <superblock uuid="" block_size="128" nr_blocks="0" current_era="0">
   <era_array>
   </era_array>
@@ -19,7 +19,7 @@ EOF
   end
 
   it "should handle more complicated metadata" do
-    metadata = read_xml(StringIO.new(<<EOF))
+    metadata = EraXML::read_xml(StringIO.new(<<EOF))
 <superblock uuid="blip blop" block_size="256" nr_blocks="32" current_era="100">
   <writeset era="98" nr_bits="32">
     <bit block="0" value="true"/>

data/thinp_xml.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'json', '~> 1.7.7'
+  spec.add_development_dependency 'json'
   spec.add_development_dependency "cucumber"
   spec.add_development_dependency "aruba"
   spec.add_development_dependency "rspec"

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: thinp_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.24
 platform: ruby
 authors:
 - Joe Thornber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ejt_command_line
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   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'
 - !ruby/object:Gem::Dependency
   name: aruba
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: Ruby library for parsing and generating the Linux thin-provisioning xml
@@ -120,8 +120,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -177,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Thin provisioning xml