thinp_xml 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWY0MTQ0ZmY5YTQ0MmQwNTE4Mjg1YWE3ZWU3MzhhZmFmODFiNDk3ZA==
+    OTc1YTFmYjhkNjI2ZDI4MjU2ZGZlZTU1MTFkZTVjZTFkNTM4NzAzNw==
   data.tar.gz: !binary |-
-    NzUxMmVmMzU0YTIwZTViYmRkNjI5NzRkNzkzZjUxZGVlMjQ4NjRjMQ==
+    NzE5ZWY2N2EyYmJiMjA5MDYwOTcwMjczZjg0YzJjNDZiNWZlZTEyMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTAxNWM1Yzk0NzQ1YzFmMDhlY2I4ZDVlMzE3NTA5ZDMwNjhlYWExMTA2MmI0
-    NzJjMGJhYjg1YjhkYjNhYTJhYjZjOTg3ZWNhYjY2Mjk3M2NmNTY5MGNlMzMx
-    ZDNiYmZmNmQyOGI5NTcxY2Q2NWRlOGJkMDkxZGU4M2JlNWJmNjI=
+    ZGM4Y2I3Y2U3ZGM5N2JjMWUyNjAyZjA0M2YxZjQ4NGYzMDBkZGI3NTMzNGMx
+    YzdkYjU5MGFjOGMwMmQ0NGFjZDc5YzIxODY3M2QwOTYwNzdkY2RkYTJhODk2
+    MzQzMzNkMTU1NmQxMjZjYTMyYjRmZmI1NTRlMmI0MzBhZjBlY2E=
   data.tar.gz: !binary |-
-    ZDM1Yzc0MDlhZDI3MzY1YzQ2MThkM2VhZGFiNThiZjYyZmI1ODY4NWE5NTYx
-    MzlmMzViNDg2Yjg4NDljYTRlNDFhY2M0MmRmM2U0NTQ3YTI5NzRmMzE1M2Fl
-    YjAxY2U0NzNhYTY3MDA2MjMyODMxOTI4NWE1N2E0ODM5MGMwN2Y=
+    OGY5ZjExZmEyNTQwMDdmZDFjYmJjODljYzUxODIwZDA1NDE4NTQ4YjJhODJm
+    ZjkzNDJhNjU2YjJlOTBhMTBjZTVkZGVhOTEzYTg2YmY5ZTRmMjM1NDY1ZDgy
+    N2Q5YjY0Y2I4MDBhNTc0MmU3N2QyNGZjOTQ1NDk3YjhjMzE4YzY=

data/features/create.feature

@@ -4,7 +4,7 @@ Feature: I can create new metadata
     When I thinp_xml create
     Then the stdout should contain:
     """
-    <superblock uuid="" time="0" transaction="1" data_block_size="128" nr_data_blocks="100">
+    <superblock uuid="" time="0" transaction="1" data_block_size="128" nr_data_blocks="0">
     </superblock>
     """
 
@@ -12,7 +12,7 @@ Feature: I can create new metadata
     When I thinp_xml create --uuid 'one two three'
     Then the stdout should contain:
     """
-    <superblock uuid="one two three" time="0" transaction="1" data_block_size="128" nr_data_blocks="100">
+    <superblock uuid="one two three" time="0" transaction="1" data_block_size="128" nr_data_blocks="0">
     </superblock>
     """
 
@@ -20,7 +20,7 @@ Feature: I can create new metadata
     When I thinp_xml create --nr-thins 3
     Then the stdout should contain:
     """
-    <superblock uuid="" time="0" transaction="1" data_block_size="128" nr_data_blocks="100">
+    <superblock uuid="" time="0" transaction="1" data_block_size="128" nr_data_blocks="0">
       <device dev_id="0" mapped_blocks="0" transaction="0" creation_time="0" snap_time="0">
       </device>
       <device dev_id="1" mapped_blocks="0" transaction="0" creation_time="0" snap_time="0">
@@ -34,7 +34,7 @@ Feature: I can create new metadata
     When I thinp_xml create --nr-thins 1 --nr-mappings 67
     Then the stdout should contain:
     """
-    <superblock uuid="" time="0" transaction="1" data_block_size="128" nr_data_blocks="100">
+    <superblock uuid="" time="0" transaction="1" data_block_size="128" nr_data_blocks="67">
       <device dev_id="0" mapped_blocks="67" transaction="0" creation_time="0" snap_time="0">
         <range_mapping origin_begin="0" data_begin="0" length="67" time="1"/>
       </device>
@@ -52,6 +52,3 @@ Feature: I can create new metadata
   Scenario: A uniform distribution can be given for nr mappings
     When I thinp_xml create --nr-thins 1 --nr-mappings uniform[40..100]
     Then it should pass
-
-
-

data/lib/thinp_xml/builder.rb

@@ -15,13 +15,15 @@ module ThinpXML
     def generate
       nr_thins = @nr_thins.to_i
 
-      superblock = Superblock.new(@uuid, 0, 1, 128, 100)
+      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, 128, nr_data_blocks)
 
       devices = Array.new
       offset = 0
       0.upto(nr_thins - 1) do |dev|
         mappings = Array.new
-        nr_mappings = @nr_mappings.to_i
+        nr_mappings = mapping_counts[dev]
 
         if nr_mappings > 0
           mappings << Mapping.new(0, offset, nr_mappings, 1)

data/lib/thinp_xml/version.rb

@@ -1,3 +1,3 @@
 module ThinpXml
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/builder_spec.rb

@@ -90,6 +90,14 @@ describe "ThinpXML::Builder" do
 
       md.devices[0].should have(1).mappings
     end
+
+    it "should be used to calculate the nr data blocks" do
+      @b.nr_thins = 2
+      @b.nr_mappings = 117
+      md = @b.generate
+
+      md.superblock.nr_data_blocks.should == 234
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinp_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Joe Thornber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ejt_command_line