thinp_xml 0.0.15 → 0.0.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk0ZDhmMmUyM2I5MDVjYTgwZjQ0OTZmMTFkNThkODQwMzM1ODEzMQ==
+    MzdlNzA5ZjhiNjk5YzdkMTVkMmNlMzVhZTZmODZhY2IxNGI5M2ZkNA==
   data.tar.gz: !binary |-
-    YWVmNWRkZDgyZWE5ZGJmNzkzNDIyNTQxY2E0Zjg4ZmQxN2FlMjg2OQ==
+    NDkyODA5MmY2NGE3MjEzNmM5NmNhOThiZWNlMTI4ZjRhMWNmODA4OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDkxNGE5MmEwMTM0YjM0ZGRlMzI5MDQ3NjRkZjcxNDM3ZTFjOTY2NzQ3Nzhm
-    NWFhNGE0MDg2MGUyNzkxMWJkZTU2ZDBkMjU4MWMxMDQwYjNiZDA0NGU5ZTA4
-    MWM1NDRkY2NjZjc4ZjQzYTg1ZDUyNDMwOWEyZTk4NzA3NmYzNDI=
+    NzdiMDY4ODdhZTdlOGI4OTYxYTE4YTcwYjg4ODlmNWFiNmVlNDI3YTgzNTRm
+    NGMzOTA2ODRjM2E0NDFkZGZiMmRkMTViYWExZjJhYjcyZTgwMmZkOWI0ZDEw
+    NGNmMmEzYmQ5NjIwNzM0MWE3ZWRiMTM1NzNlYWI3YzFlMzExMzI=
   data.tar.gz: !binary |-
-    OTNjZGI5MjU5ZGExNmU1YzY5MGU3OTBjOTc0ODNhYWNlNTk2ZmQ0ZjdiYzRl
-    ZjM4NjM2YTYyNWU3NjE3YjE0ODVlYjQxMWYzMGU2ZmVlNzJhZDNlY2JmZmEz
-    MjA2MzU0Y2I0ZmJlODdhM2Q4ZmUxMWE2MWM5OTY2ODlkYmI4ZTU=
+    MjJjM2M2ZjA5OTE5ODhmODg1YmExYjAzMGY5OTcxYzExY2VlMDU4ZGZjYTdi
+    YmI4ZjMzNDZlMzdmZWZlNWI0MmE0NzNkMDMyMGI0YWMwZmM2ZTRlYThkMGMx
+    OTkyNzkxNjhkOWZmMTE5ODBiMjRmMjc1ODA1OGExNzU5MGNmNTc=

data/bin/cache_xml

@@ -100,7 +100,20 @@ class Dispatcher
   def help(out)
     out.write <<EOF
 Manipulation of cache xml format metadata
-  --help, -h:	Show this message
+
+Usage:
+  cache_xml [options]
+    --help, -h:    Show this message
+
+  cache_xml create [options]
+    --uuid:              Set the uuid
+    --block-size:        In 512 byte sectors
+    --nr-cache-blocks:   Set the nr of blocks in the cache device
+    --nr-mappings:       Set the nr of mappings, either a number or distribution (eg, 'uniform[45..100]')
+    --dirty-percentage:  What percentage of the cache should be marked dirty
+    --policy-name:       Set the name of the cache policy (eg, 'mq')
+    --hint-width:        Set the hint width (current kernels only support 4 bytes)
+    --mapping-policy:    Changes how the mappings are generated; 'random' or 'linear'
 EOF
   end
 end
@@ -114,6 +127,7 @@ def top_level_handler(&block)
     block.call
   rescue => e
     STDERR.puts e.message
+    STDERR.puts e.backtrace.join("\n")
     exit 1
   end
 

data/bin/era_xml

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+
+require 'thinp_xml/era_xml'
+require 'ejt_command_line'
+
+include EraXML
+
+#----------------------------------------------------------------
+
+EraCommandLine = CommandLine::Parser.new do
+  value_type :string do |str|
+    str
+  end
+
+  value_type :int do |str|
+    Integer(str)
+  end
+
+  simple_switch :help, '--help', '-h'
+  value_switch :uuid, :string, '--uuid'
+  value_switch :block_size, :int, '--block-size'
+  value_switch :nr_blocks, :int, '--nr-blocks'
+  value_switch :current_era, :int, '--current-era'
+  value_switch :nr_writesets, :int, '--nr-writesets'
+
+  global do
+    switches :help
+  end
+
+  command :create do
+    switches :uuid, :block_size, :nr_blocks, :current_era, :nr_writesets
+  end
+end
+
+#----------------------------------------------------------------
+
+class Dispatcher
+  include EraXML
+
+  def global_command(opts, args)
+    if args.size > 0
+      die "unknown command '#{args[0]}'"
+      else
+      if opts[:help]
+        help(STDOUT)
+      else
+        die "no command given"
+      end
+    end
+  end
+
+  def create(opts, args)
+    b = Builder.new
+    b.uuid = opts.fetch(:uuid, '')
+    b.block_size = opts.fetch(:block_size, 128)
+    b.nr_blocks = opts.fetch(:nr_blocks, 0)
+    b.current_era = opts.fetch(:current_era, 0)
+    b.nr_writesets = opts.fetch(:nr_writesets, 0)
+
+    md = b.generate
+    write_xml(md, STDOUT)
+  end
+
+  private
+  def die(msg)
+    STDERR.puts msg
+    exit(1)
+  end
+
+  def help(out)
+    # FIXME: inadequate
+    out.write <<EOF
+Manipulation of era xml format metadata
+
+Usage:
+   era_xml [options]
+     --help, -h:   Show this message
+
+   era_xml create [options]
+     --uuid:         Set the uuid for the metadata
+     --block-size:   Set the block size, in 512 byte sectors
+     --nr-blocks:    Set the number of blocks
+     --current-era:  Set the current era
+
+     --nr-writesets: Output a number of undigested writesets (you
+                     probably don't need this unless you're debugging).
+EOF
+  end
+end
+
+def parse_command_line(dispatcher, *args)
+  EraCommandLine.parse(dispatcher, *args)
+end
+
+def top_level_handler(&block)
+  begin
+    block.call
+  rescue => e
+    STDERR.puts e.message
+    STDERR.puts e.backtrace.join("\n")
+    exit 1
+  end
+
+  exit 0
+end
+
+#----------------------------------------------------------------
+
+top_level_handler do
+  dispatcher = Dispatcher.new
+  parse_command_line(dispatcher, *ARGV)
+end
+
+#----------------------------------------------------------------

data/bin/thinp_xml

@@ -86,6 +86,7 @@ def top_level_handler(&block)
     block.call
   rescue => e
     STDERR.puts e.message
+    STDERR.puts e.backtrace.join("\n")
     exit 1
   end
 

data/features/cache_usage.feature

@@ -5,7 +5,20 @@ Feature: The tool should be helpful
     Then the stdout should contain:
       """
       Manipulation of cache xml format metadata
-        --help, -h:	Show this message
+
+      Usage:
+        cache_xml [options]
+          --help, -h:    Show this message
+
+        cache_xml create [options]
+          --uuid:              Set the uuid
+          --block-size:        In 512 byte sectors
+          --nr-cache-blocks:   Set the nr of blocks in the cache device
+          --nr-mappings:       Set the nr of mappings, either a number or distribution (eg, 'uniform[45..100]')
+          --dirty-percentage:  What percentage of the cache should be marked dirty
+          --policy-name:       Set the name of the cache policy (eg, 'mq')
+          --hint-width:        Set the hint width (current kernels only support 4 bytes)
+          --mapping-policy:    Changes how the mappings are generated; 'random' or 'linear'
       """
 
   Scenario: Unknown sub commands cause fail

data/features/era_create.feature

@@ -0,0 +1,59 @@
+Feature: I can create new metadata
+
+  Scenario: Create a valid superblock with no blocks
+    When I era_xml create
+    Then the stdout should contain:
+    """
+    <superblock uuid="" block_size="128" nr_blocks="0" current_era="0">
+      <era_array>
+      </era_array>
+    </superblock>
+    """
+
+  Scenario: Create a valid superblock with specified uuid
+    When I era_xml create --uuid 'one two three'
+    Then the stdout should contain:
+    """
+    <superblock uuid="one two three" block_size="128" nr_blocks="0" current_era="0">
+      <era_array>
+      </era_array>
+    </superblock>
+    """
+
+  Scenario: Create a superblock with specified block size
+    When I era_xml create --block-size 512
+    Then the stdout should contain:
+    """
+    <superblock uuid="" block_size="512" nr_blocks="0" current_era="0">
+      <era_array>
+      </era_array>
+    </superblock>
+    """
+
+  Scenario: Fail if the block size is not an integer
+    When I era_xml create --block-size large
+    Then it should fail
+    
+  Scenario: Accept --nr-blocks
+    When I era_xml create --nr-blocks 8
+    Then it should pass
+
+  Scenario: Fail if the nr blocks is not an integer
+    When I era_xml create --nr-blocks loads
+    Then it should fail
+
+  Scenario: Accept --current-era
+    When I era_xml create --current-era 1000
+    Then it should pass
+
+  Scenario: Fail if the current era is not an integer
+    When I era_xml create --current-era peistocene
+    Then it should fail
+
+  Scenario: Accept --nr-writesets
+    When I era_xml create --nr-writesets 56 --current-era 100
+    Then it should pass
+
+  Scenario: Fail if the nr writesets is not an integer
+    When I era_xml create --nr-writesets lots --current-era 1000
+    Then it should fail

data/features/era_usage.feature

@@ -0,0 +1,29 @@
+Feature: The tool should be helpful
+
+  Scenario: --help prints usage to stdout
+    When I era_xml --help
+    Then the stdout should contain:
+      """
+      Manipulation of era xml format metadata
+
+      Usage:
+         era_xml [options]
+           --help, -h:   Show this message
+
+         era_xml create [options]
+           --uuid:         Set the uuid for the metadata
+           --block-size:   Set the block size, in 512 byte sectors
+           --nr-blocks:    Set the number of blocks
+           --current-era:  Set the current era
+
+           --nr-writesets: Output a number of undigested writesets (you
+                           probably don't need this unless you're debugging).
+      """
+
+  Scenario: Unknown sub commands cause fail
+    When I era_xml unleashtheearwigs
+    Then it should fail
+    And the stderr should contain:
+    """
+    unknown command 'unleashtheearwigs'
+    """

data/features/step_definitions/thinp_xml.rb

@@ -6,6 +6,10 @@ When(/^I cache_xml (.*)$/) do |cmd|
   run_simple(unescape("cache_xml #{cmd}"), false)
 end
 
+When(/^I era_xml (.*)$/) do |cmd|
+  run_simple(unescape("era_xml #{cmd}"), false)
+end
+
 Then(/^it should pass$/) do
   assert_success(true)
 end

data/lib/thinp_xml/era/builder.rb

@@ -0,0 +1,47 @@
+require 'thinp_xml/era/metadata'
+
+#----------------------------------------------------------------
+
+module EraXML
+  class Builder
+    attr_accessor :uuid, :block_size, :nr_blocks, :current_era, :nr_writesets
+
+    def initialize
+      @uuid = ''
+      @block_size = 128
+      @nr_blocks = 0
+      @current_era = 0
+      @nr_writesets = 0
+    end
+
+    def generate
+      s = Superblock.new(@uuid, @block_size, @nr_blocks, @current_era)
+
+      if @nr_writesets > @current_era
+        raise "can't have more writesets than eras"
+      end
+
+      era_array_limit = @current_era - @nr_writesets
+
+      writesets = (0..@nr_writesets - 1).map do |i|
+        bits = (0..@nr_blocks - 1).map do |block|
+          WritesetBit.new(block, rand(2) == 0 ? false : true)
+        end
+
+        Writeset.new(era_array_limit + i, @nr_blocks, bits)
+      end
+
+      era_array = (0..@nr_blocks - 1).map do |block|
+        if @current_era > 0
+          rand(era_array_limit)
+        else
+          0
+        end
+      end
+
+      Metadata.new(s, writesets, era_array)
+    end
+  end
+end
+
+#----------------------------------------------------------------

data/lib/thinp_xml/era/emit.rb

@@ -0,0 +1,52 @@
+require 'thinp_xml/era/metadata'
+require 'thinp_xml/emitter'
+
+#----------------------------------------------------------------
+
+module EraXML
+  module EraEmitterDetail
+    class EraEmitter
+      def initialize(out)
+        @e = ThinpXML::Base::Emitter.new(out)
+      end
+
+      def emit_superblock(sb, &block)
+        @e.emit_tag(sb, 'superblock', :uuid, :block_size, :nr_blocks, :current_era, &block)
+      end
+
+      def emit_writesets(sets)
+        sets.each do |ws|
+          block = lambda do
+            ws.bits.each do |b|
+              @e.emit_tag(b, :block, :value)
+            end
+          end
+
+          @e.emit_tag(ws, 'writeset', :era, :nr_blocks, &block)
+        end
+      end
+
+      def emit_era_array(ea)
+        block = lambda do
+          ea.each_index do |b|
+            @e.emit_line("<era block=\"#{b}\" era=\"#{ea[b]}\"\\>")
+          end
+        end
+
+        @e.emit_tag(ea, 'era_array', &block)
+      end
+    end
+  end
+  
+  #--------------------------------
+
+  def write_xml(md, io)
+    e = EraEmitterDetail::EraEmitter.new(io)
+    e.emit_superblock(md.superblock) do
+      e.emit_writesets(md.writesets)
+      e.emit_era_array(md.era_array)
+    end
+  end
+end
+
+#----------------------------------------------------------------

data/lib/thinp_xml/era/metadata.rb

@@ -0,0 +1,22 @@
+module EraXML
+  SUPERBLOCK_FIELDS = [[:uuid, :string],
+                       [:block_size, :int],
+                       [:nr_blocks, :int],
+                       [:current_era, :int]]
+
+  WRITESET_FIELDS = [[:era, :int],
+                     [:nr_blocks, :int],
+                     [:bits, :array]]
+
+  BIT_FIELDS = [[:block, :int],
+                [:value, :bool]]
+
+  def self.field_names(flds)
+    flds.map {|p| p[0]}
+  end
+
+  Superblock = Struct.new(*field_names(SUPERBLOCK_FIELDS))
+  Writeset = Struct.new(*field_names(WRITESET_FIELDS))
+  WritesetBit = Struct.new(*field_names(BIT_FIELDS))
+  Metadata = Struct.new(:superblock, :writesets, :era_array)
+end

data/lib/thinp_xml/era_xml.rb

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

data/lib/thinp_xml/version.rb

@@ -1,3 +1,3 @@
 module ThinpXml
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/builder_spec.rb

@@ -13,58 +13,58 @@ describe "ThinpXML::Builder" do
 
   describe "uuid" do
     it "should be an empty string by default" do
-      @b.uuid.should == ''
+      expect(@b.uuid).to eq('')
     end
 
     it "should reflect any changes" do
       uuid = 'one two three'
       @b.uuid = uuid
-      @b.uuid.should == uuid
+      expect(@b.uuid).to eq(uuid)
     end
 
     it "should generate the correct uuid" do
       uuid = 'one two three'
       @b.uuid = uuid
       md = @b.generate
-      md.superblock.uuid.should == uuid
+      expect(md.superblock.uuid).to eq(uuid)
     end
   end
 
   describe "block_size" do
     it "should be 128 by default" do
-      @b.block_size.should == 128
+      expect(@b.block_size).to eq(128)
     end
 
     it "should reflect any changes" do
       @b.block_size = 512
-      @b.block_size.should == 512
+      expect(@b.block_size).to eq(512)
     end
 
     it "should generate the correct block size" do
       bs = 1024
       @b.block_size = bs
       md = @b.generate
-      md.superblock.data_block_size.should == bs
+      expect(md.superblock.data_block_size).to eq(bs)
     end
   end
 
   describe "nr of thins" do
     it "zero by default" do
-      @b.nr_thins.should == 0
+      expect(@b.nr_thins).to eq(0)
     end
 
     it "should reflect any changes" do
       @b.nr_thins = 5
-      @b.nr_thins.should == 5
+      expect(@b.nr_thins).to eq(5)
     end
 
     it "should generate the correct nr" do
       @b.nr_thins = 5
       md = @b.generate
 
-      md.should have(5).devices
+      expect(md.devices.size).to eq(5)
       0.upto(4) do |n|
-        md.devices[n].should_not == nil
+        expect(md.devices[n]).not_to eq(nil)
       end
     end
 
@@ -72,20 +72,20 @@ describe "ThinpXML::Builder" do
       @b.nr_thins = UniformDistribution.new(2, 6)
       md = @b.generate
 
-      md.should have_at_most(5).devices
-      md.should have_at_least(2).devices
+      expect(md.devices.size).to be <= 5
+      expect(md.size).to be >= 2
     end
   end
 
   describe "nr of mappings" do
     it "none by default" do
       @b.nr_thins = 1
-      @b.generate.devices[0].should have(0).mappings
+      expect(@b.generate.devices[0].mappings.size).to eq(0)
     end
 
     it "should reflect any changes" do
       @b.nr_mappings = 101
-      @b.nr_mappings.should == 101
+      expect(@b.nr_mappings).to eq(101)
     end
 
     it "should generate the correct nr" do
@@ -96,8 +96,8 @@ describe "ThinpXML::Builder" do
       0.upto(@b.nr_thins - 1) do |n|
         dev = md.devices[n]
         total = total_mapped(dev)
-        total.should == 101
-        dev.mapped_blocks.should == 101
+        expect(total).to eq(101)
+        expect(dev.mapped_blocks).to eq(101)
       end
     end
 
@@ -106,7 +106,7 @@ describe "ThinpXML::Builder" do
       @b.nr_mappings = 101
       md = @b.generate
 
-      md.devices[0].should have(1).mappings
+      expect(md.devices[0].mappings.size).to eq(1)
     end
 
     it "should be used to calculate the nr data blocks" do
@@ -114,7 +114,7 @@ describe "ThinpXML::Builder" do
       @b.nr_mappings = 117
       md = @b.generate
 
-      md.superblock.nr_data_blocks.should == 234
+      expect(md.superblock.nr_data_blocks).to eq(234)
     end
   end
 end

data/spec/cache_builder_spec.rb

@@ -18,80 +18,80 @@ describe "CacheXML::Builder" do
 
   describe "uuid" do
     it "should be an empty string by default" do
-      @b.uuid.should == ''
+      expect(@b.uuid).to eq('')
     end
 
     it "should reflect any changes" do
       uuid = 'one two three'
       @b.uuid = uuid
-      @b.uuid.should == uuid
+      expect(@b.uuid).to eq(uuid)
     end
 
     it "should generate the correct uuid" do
       uuid = 'one two three'
       @b.uuid = uuid
       md = @b.generate
-      md.superblock.uuid.should == uuid
+      expect(md.superblock.uuid).to eq(uuid)
     end
   end
 
   describe "block_size" do
     it "should be 128 by default" do
-      @b.block_size.should == 128
+      expect(@b.block_size).to eq(128)
     end
 
     it "should reflect any changes" do
       @b.block_size = 512
-      @b.block_size.should == 512
+      expect(@b.block_size).to eq(512)
     end
 
     it "should generate the correct block size" do
       bs = 1024
       @b.block_size = bs
       md = @b.generate
-      md.superblock.block_size.should == bs
+      expect(md.superblock.block_size).to eq(bs)
     end
   end
 
   describe "nr cache blocks" do
     it "should be zero by default" do
-      @b.nr_cache_blocks.should == 0
-      @b.generate.should have(0).mappings
+      expect(@b.nr_cache_blocks).to eq(0)
+      expect(@b.generate.mappings.size).to eq(0)
     end
 
     it "should reflect any changes" do
       n = rand(1000)
       @b.nr_cache_blocks = n
-      @b.nr_cache_blocks.should == n
-      @b.generate.superblock.nr_cache_blocks.should == n
+      expect(@b.nr_cache_blocks).to eq(n)
+      expect(@b.generate.superblock.nr_cache_blocks).to eq(n)
     end
   end
 
   describe "policy name" do
     it "should be 'mq' by default" do
-      @b.policy_name.should == 'mq'
-      @b.generate.superblock.policy.should == 'mq'
+      expect(@b.policy_name).to eq('mq')
+      expect(@b.generate.superblock.policy).to eq('mq')
     end
 
     it "should reflect changes" do
       n = 'most_recently_not_used_least'
       @b.policy_name = n
-      @b.policy_name.should == n
-      @b.generate.superblock.policy.should == n
+      expect(@b.policy_name).to eq(n)
+      expect(@b.generate.superblock.policy).to eq(n)
     end
   end
 
   describe "hint width" do
     it "should be '4' by default" do
-      @b.hint_width.should == 4
-      @b.generate.superblock.hint_width.should == 4
+      expect(@b.hint_width).to eq(4)
+      expect(@b.generate.superblock.hint_width).to eq(4)
     end
 
     it "should allow a hint size between 4 and 128, mod 4" do
       0.upto(132) do |n|
         if (((n % 4) == 0) && n <= 128)
           @b.hint_width = n
-          @b.hint_width.should == n
+          expect(@b.hint_width).to eq(n)
         end
       end
     end
@@ -106,14 +106,14 @@ describe "CacheXML::Builder" do
 
     it "should reflect changes" do
       @b.hint_width = 12
-      @b.generate.superblock.hint_width.should == 12
+      expect(@b.generate.superblock.hint_width).to eq(12)
     end
   end
 
   describe "mappings" do
     describe "mapping policy" do
       it "should default to :random" do
-        @b.mapping_policy.should == :random
+        expect(@b.mapping_policy).to eq(:random)
       end
 
       it "should only accept :random, or :linear" do
@@ -125,7 +125,7 @@ describe "CacheXML::Builder" do
 
     describe "nr mappings" do
       it "should default to zero" do
-        @b.nr_mappings.should == 0
+        expect(@b.nr_mappings).to eq(0)
       end
 
       it "should never be bigger than the nr_cache_blocks" do
@@ -140,14 +140,14 @@ describe "CacheXML::Builder" do
         100.times do
           @b.nr_cache_blocks = rand(1000)
           @b.nr_mappings = rand(@b.nr_cache_blocks)
-          @b.generate.should have(@b.nr_mappings).mappings
+          expect(@b.generate.mappings.size).to eq(@b.nr_mappings)
         end
       end
     end
 
     describe "dirty percentage" do
       it "should default to zero" do
-        @b.dirty_percentage.should == 0
+        expect(@b.dirty_percentage).to eq(0)
       end
 
       it "should throw if set to a negative number" do
@@ -165,7 +165,7 @@ describe "CacheXML::Builder" do
       it "should accept a valid value" do
         [0, 1, 34, 78, 99, 100].each do |valid_value|
           @b.dirty_percentage = valid_value
-          @b.dirty_percentage.should == valid_value
+          expect(@b.dirty_percentage).to eq(valid_value)
         end
       end
 
@@ -182,7 +182,7 @@ describe "CacheXML::Builder" do
             nr_dirty += 1 if m.dirty
           end
 
-          approx_percentage(nr_dirty, n_mappings, p).should be_true
+          expect(approx_percentage(nr_dirty, n_mappings, p)).to be_truthy
         end
       end
     end
@@ -199,7 +199,7 @@ describe "CacheXML::Builder" do
 
         cb = 0
         mappings.each do |m|
-          m.cache_block.should == cb
+          expect(m.cache_block).to eq(cb)
           cb += 1
         end
       end
@@ -214,7 +214,7 @@ describe "CacheXML::Builder" do
           if b.nil?
             b = m.origin_block
           else
-            m.origin_block.should == b
+            expect(m.origin_block).to eq(b)
           end
 
           b += 1
@@ -234,7 +234,7 @@ describe "CacheXML::Builder" do
 
         cb = 0
         mappings.each do |m|
-          m.cache_block.should == cb
+          expect(m.cache_block).to eq(cb)
           cb += 1
         end
       end
@@ -258,7 +258,7 @@ describe "CacheXML::Builder" do
           b += 1
         end
 
-        in_order.should be_false
+        expect(in_order).to be_falsey
       end
     end
   end

data/spec/distribution_spec.rb

@@ -35,12 +35,12 @@ describe "integer distributions" do
     it "should always return it's given value" do
       dist = ConstDistribution.new(5)
       10.times do
-        dist.generate.should == 5
+        expect(dist.generate).to eq(5)
       end
 
       dist = ConstDistribution.new(11)
       10.times do
-        dist.generate.should == 11
+        expect(dist.generate).to eq(11)
       end
     end
 
@@ -75,12 +75,12 @@ describe "integer distributions" do
         buckets[dist.generate] += 1
       end
 
-      buckets[0].should == 0
-      buckets[10].should == 0
+      expect(buckets[0]).to eq(0)
+      expect(buckets[10]).to eq(0)
 
       1.upto(9) do |n|
-        buckets[n].should_not == 0
-        buckets[n].should be_approx(1000, 200)
+        expect(buckets[n]).not_to eq(0)
+        expect(buckets[n]).to be_approx(1000, 200)
       end
     end
 
@@ -96,7 +96,7 @@ describe "integer distributions" do
       end
 
       dist.to_i
-      $called456.should be_true
+      expect($called456).to be_truthy
     end
   end
 
@@ -107,16 +107,16 @@ describe "integer distributions" do
       it "should parse a const expression" do
         10.times do
           n = rand(50)
-          parse_distribution(n.to_s).to_i.should == n
-          parse_distribution(n.to_s).to_i.should == n
+          expect(parse_distribution(n.to_s).to_i).to eq(n)
+          expect(parse_distribution(n.to_s).to_i).to eq(n)
         end
       end
     end
 
     describe "uniform expression" do
       def check_range(b, e, n)
-        n.should >= b
-        n.should < e
+        expect(n).to be >= b
+        expect(n).to be < e
       end
 
       it "should accept well formed expressions" do

data/spec/era_builder_spec.rb

@@ -0,0 +1,154 @@
+require 'thinp_xml/era/builder'
+
+require 'set'
+
+#----------------------------------------------------------------
+
+describe "EraXML::Builder" do
+  before :each do
+    @b = EraXML::Builder.new
+  end
+
+  describe "uuid" do
+    it "should be an empty string by default" do
+      expect(@b.uuid).to eq('')
+    end
+
+    it "should reflect any changes" do
+      uuid = 'one two three'
+      @b.uuid = uuid
+      expect(@b.uuid).to eq(uuid)
+    end
+
+    it "should generate the correct uuid" do
+      uuid = 'one two three'
+      @b.uuid = uuid
+      md = @b.generate
+      expect(md.superblock.uuid).to eq(uuid)
+    end
+  end
+
+  describe "block_size" do
+    it "should be 128 by default" do
+      expect(@b.block_size).to eq(128)
+    end
+
+    it "should reflect any changes" do
+      @b.block_size = 512
+      expect(@b.block_size).to eq(512)
+    end
+
+    it "should generate the correct block size" do
+      bs = 1024
+      @b.block_size = bs
+      md = @b.generate
+      expect(md.superblock.block_size).to eq(bs)
+    end
+  end
+
+  describe "nr_blocks" do
+    it "should be 0 by default" do
+      expect(@b.nr_blocks).to eq(0)
+    end
+
+    it "should reflect any changes" do
+      @b.nr_blocks = 1234
+      expect(@b.nr_blocks).to eq(1234)
+    end
+
+    it "should generate the correct nr blocks" do
+      n = 1234
+      @b.nr_blocks = n
+      md = @b.generate
+      expect(md.superblock.nr_blocks).to eq(n)
+    end
+  end
+
+  describe "current_era" do
+    it "should be 0 by default" do
+      expect(@b.current_era).to eq(0)
+    end
+
+    it "should reflect any changes" do
+      @b.current_era = 678
+      expect(@b.current_era).to eq(678)
+    end
+
+    it "should generate the correct current_era" do
+      @b.current_era = 678
+      md = @b.generate
+      expect(md.superblock.current_era).to eq(678)
+    end
+  end
+
+  describe "nr_writesets" do
+    it "should be 0 by default" do
+      expect(@b.nr_writesets).to eq(0)
+    end
+
+    it "should reflect any changes" do
+      @b.nr_writesets = 34
+      expect(@b.nr_writesets).to eq(34)
+    end
+
+    it "should generate the correct nr writesets" do
+      @b.current_era = 100
+      @b.nr_writesets = 34
+      md = @b.generate
+      expect(md.writesets.size).to eq(34)
+    end
+
+    it "should raise if asked to generate more writesets than eras" do
+      @b.nr_writesets = 50
+      @b.current_era = 40
+      expect do
+        @b.generate
+      end.to raise_error(RuntimeError)
+    end
+  end
+
+  describe "generated metadata" do
+    before :each do
+      @b.nr_blocks = 1234
+      @b.nr_writesets = 50
+      @b.current_era = 100
+      @md = @b.generate
+    end
+
+    describe "era array" do
+      it "should have nr_blocks entries" do
+        expect(@md.era_array.size).to eq(@b.nr_blocks)
+      end
+
+      it "should have no value higher than the current era" do
+        @md.era_array.each do |era|
+          expect(era).to be <= @b.current_era
+        end
+      end
+    end
+
+    describe "generated writesets" do
+      it "should not have an era higher than the current era" do
+        @md.writesets.each do |ws|
+          expect(ws.era).to be <= @b.current_era
+        end
+      end
+
+      it "should not have duplicate eras" do
+        seen = Set.new
+        @md.writesets.each do |ws|
+          expect(seen.member?(ws.era)).to be false
+          seen.add(ws.era)
+        end
+      end
+
+      it "should have the correct number of bits" do
+        @md.writesets.each do |ws|
+          expect(ws.bits.size).to eq(@b.nr_blocks)
+        end
+      end
+    end
+  end
+end
+
+#----------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinp_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Joe Thornber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ejt_command_line
@@ -115,6 +115,7 @@ email:
 executables:
 - analyse_metadata
 - cache_xml
+- era_xml
 - thinp_xml
 extensions: []
 extra_rdoc_files: []
@@ -127,9 +128,12 @@ files:
 - Rakefile
 - bin/analyse_metadata
 - bin/cache_xml
+- bin/era_xml
 - bin/thinp_xml
 - features/cache_create.feature
 - features/cache_usage.feature
+- features/era_create.feature
+- features/era_usage.feature
 - features/step_definitions/thinp_xml.rb
 - features/support/env.rb
 - features/thinp_create.feature
@@ -142,6 +146,10 @@ files:
 - lib/thinp_xml/cache_xml.rb
 - lib/thinp_xml/distribution.rb
 - lib/thinp_xml/emitter.rb
+- lib/thinp_xml/era/builder.rb
+- lib/thinp_xml/era/emit.rb
+- lib/thinp_xml/era/metadata.rb
+- lib/thinp_xml/era_xml.rb
 - lib/thinp_xml/listener.rb
 - lib/thinp_xml/thinp/analysis.rb
 - lib/thinp_xml/thinp/builder.rb
@@ -155,6 +163,7 @@ files:
 - spec/cache_builder_spec.rb
 - spec/cache_parse_spec.rb
 - spec/distribution_spec.rb
+- spec/era_builder_spec.rb
 - thinp_xml.gemspec
 homepage: ''
 licenses:
@@ -183,6 +192,8 @@ summary: Thin provisioning xml
 test_files:
 - features/cache_create.feature
 - features/cache_usage.feature
+- features/era_create.feature
+- features/era_usage.feature
 - features/step_definitions/thinp_xml.rb
 - features/support/env.rb
 - features/thinp_create.feature
@@ -191,3 +202,4 @@ test_files:
 - spec/cache_builder_spec.rb
 - spec/cache_parse_spec.rb
 - spec/distribution_spec.rb
+- spec/era_builder_spec.rb