thinp_xml 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTc1YTFmYjhkNjI2ZDI4MjU2ZGZlZTU1MTFkZTVjZTFkNTM4NzAzNw==
+    NjEzY2RlNTQwYTJkM2U1YTU0ZmYxYzA4ZjgyMmI3OWM3ZTVlZGZhOA==
   data.tar.gz: !binary |-
-    NzE5ZWY2N2EyYmJiMjA5MDYwOTcwMjczZjg0YzJjNDZiNWZlZTEyMw==
+    OGM5ZjgwY2FlN2FjYmUyZmJjMDE2MTdmMzQ0YWY4NGQzMDhkNjY5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGM4Y2I3Y2U3ZGM5N2JjMWUyNjAyZjA0M2YxZjQ4NGYzMDBkZGI3NTMzNGMx
-    YzdkYjU5MGFjOGMwMmQ0NGFjZDc5YzIxODY3M2QwOTYwNzdkY2RkYTJhODk2
-    MzQzMzNkMTU1NmQxMjZjYTMyYjRmZmI1NTRlMmI0MzBhZjBlY2E=
+    NDQ2YTM1ZDU3ZmU3MzllODJlYWI0OGMzNjI4ZWEyYThmMzUxMDI2MjAyZTAw
+    ODIxZmJlZTNiMzE4NTc5N2RkNDY2MjdiODBmMjk5YzU1NGRjZTM2MDJhZDM4
+    YTViODg4YzdlYmEyODZlOTdlMWQ0MjViNDk0NTBiMmIwNDRiYTk=
   data.tar.gz: !binary |-
-    OGY5ZjExZmEyNTQwMDdmZDFjYmJjODljYzUxODIwZDA1NDE4NTQ4YjJhODJm
-    ZjkzNDJhNjU2YjJlOTBhMTBjZTVkZGVhOTEzYTg2YmY5ZTRmMjM1NDY1ZDgy
-    N2Q5YjY0Y2I4MDBhNTc0MmU3N2QyNGZjOTQ1NDk3YjhjMzE4YzY=
+    ZjEwMDE2ZWE0YTNlNmUyZGUyYTI2YTg4NDA3MGI5ZTJiMDA5ODA1Zjc1ZTQz
+    ZGQ1NjNiMjRlMGNmZDg0MjhlNmJmMzM4NWJlYjc1Yzg2Yjc5YjM1ZTQzNGE2
+    NGUxNTdiNGNhYThlNWE5NzRmMDBmNmFhYzgyYTkyYTE1YWEwMGI=

data/README.md

@@ -24,12 +24,12 @@ Or install it yourself as:
 
 ## Usage
 
-    $ thinp_xml create --nr-thins 4 --nr-mappings 100
+    $ thinp_xml create --nr-thins 4 --nr-mappings 100 --block-size 512
 
 When specifying numerical constants you may also give a random number distribution.
 
     uniform[<begin>..<end inclusive>]
 
-    $ thinp_xml create --nr-thins uniform[4..9] --nr-mappings uniform[1000..10000]
+    $ thinp_xml create --nr-thins uniform[4..9] --nr-mappings uniform[1000..10000] --block-size 1024
 
 

data/bin/thinp_xml

@@ -30,13 +30,14 @@ XMLCommandLine = CommandLine::Parser.new do
   value_switch :uuid, :string, '--uuid'
   value_switch :nr_thins, :int_distribution, '--nr-thins'
   value_switch :nr_mappings, :int_distribution, '--nr-mappings'
+  value_switch :block_size, :int, '--block-size'
 
   global do
     switches :help
   end
 
   command :create do
-    switches :uuid, :nr_thins, :nr_mappings
+    switches :uuid, :nr_thins, :nr_mappings, :block_size
   end
 end
 
@@ -60,6 +61,7 @@ class Dispatcher
     b.uuid = opts.fetch(:uuid, '')
     b.nr_thins = opts.fetch(:nr_thins, 0)
     b.nr_mappings = opts.fetch(:nr_mappings, 0)
+    b.block_size = opts.fetch(:block_size, 128)
     md = b.generate
     write_xml(md, STDOUT)
   end

data/features/create.feature

@@ -16,6 +16,14 @@ Feature: I can create new metadata
     </superblock>
     """
 
+  Scenario: Create a valid superblock with specified block size
+    When I thinp_xml create --block-size 512
+    Then the stdout should contain:
+    """
+    <superblock uuid="" time="0" transaction="1" data_block_size="512" nr_data_blocks="0">
+    </superblock>
+    """
+
   Scenario: Take an expression for the number of devices
     When I thinp_xml create --nr-thins 3
     Then the stdout should contain:

data/lib/thinp_xml/builder.rb

@@ -4,12 +4,13 @@ require 'thinp_xml/metadata'
 
 module ThinpXML
   class Builder
-    attr_accessor :uuid, :nr_thins, :nr_mappings
+    attr_accessor :uuid, :nr_thins, :nr_mappings, :block_size
 
     def initialize
       @uuid = ''
       @nr_thins = 0
       @nr_mappings = 0
+      @block_size = 128
     end
 
     def generate
@@ -17,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, 128, nr_data_blocks)
+      superblock = Superblock.new(@uuid, 0, 1, @block_size, nr_data_blocks)
 
       devices = Array.new
       offset = 0

data/lib/thinp_xml/version.rb

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

data/spec/builder_spec.rb

@@ -30,6 +30,24 @@ describe "ThinpXML::Builder" do
     end
   end
 
+  describe "block_size" do
+    it "should be 128 by default" do
+      @b.block_size.should == 128
+    end
+
+    it "should reflect any changes" do
+      @b.block_size = 512
+      @b.block_size.should == 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
+    end
+  end
+
   describe "nr of thins" do
     it "zero by default" do
       @b.nr_thins.should == 0

metadata

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