thinp_xml 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDliZTU2MTk0NmM1MTVkZmNjOTAyNDFmOTIwNzc2MTFjYWJmODgzZg==
+    NDI2YmNiNDk0MDVmYWRmMTE1ZWU3MTM4NGQ2NjM4MzAwY2IxNTYyMw==
   data.tar.gz: !binary |-
-    OGQ0ODI3OGM0YjVhZWFmOGYwMjBmZjIxMjFmMTQ5NzNiNWI2MjJjOA==
+    ZDI0YzI0OWJjNTdhZmVmMmQ2ZmU5NmFhOWU1NjJjZWJhYWQ5NzNiOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGYxY2UwYzg1MzVkNDJjZDE5NjFmYTg4ZjYxMWMyMGM2NzY4MzE2M2FiMzE4
-    ZTMxMjFiMzAyNDc1YjQ1YWUyM2Q3YzFhODU5YzUzYjFjNTIyYTViN2NhMjFj
-    ZmRiYmMyYzM1ZTM3NzYzZTk0MzBkYjA1M2ZiMWUwMDc2Y2Q3NmQ=
+    ODliNDQ3MDBlNzIxOTMyODc5YzBhNjczYjJmMjg2Y2M5MzJiNTYwMzYyODc0
+    ZWMwY2U5OTJiYTBiM2I5OWQ4ZDNkZGMxNTE4NGNlZjhiYzRlYTBmNTdmYTM3
+    NTNiM2M3Y2MxOTNlNTBhZTc5ZWVjY2JhNDMyZjgxYmU4Yjg0ODA=
   data.tar.gz: !binary |-
-    ZTc1M2Y4ODc3YWE0ZjNkOTYzNGM5YjIwYmVkYTM0NDE4ZjVlMzY4YzhhY2Ri
-    YzMyYTcyMTYyODYwNWIyNmY4MmViYjY2NTViNDlmNjQ4Mzk0OTU5MDFhNGFk
-    NmY3ZTc4MmFlYjcyYzU0ZTY0MzBjYzBjZWExZWViNzRjYTFiNGM=
+    M2I3NDM3Mjc2MzE4YjY1M2UwYmMxZTUyMWYyYWI0MDczODY2ZTcwM2YwMDI3
+    MGM5NmQ3MTBiNzA3OGZmNjhmZDMwMzJhYzQxYTFhODI4NThhZGQ1ZTViYTcy
+    Yjk1NjY0NDkzNDBmMTVhN2ZiNDc5NmFkZGE1ZGUwNTI0MmY3YjQ=

data/bin/cache_xml

@@ -47,13 +47,15 @@ CacheCommandLine = CommandLine::Parser.new do
   value_switch :nr_mappings, :distribution, '--nr-mappings'
   value_switch :mapping_policy, :layout, '--layout'
   value_switch :dirty_percentage, :percentage, '--dirty-percent'
+  value_switch :policy, :string, '--policy'
 
   global do
     switches :help
   end
 
   command :create do
-    switches :nr_cache_blocks, :uuid, :block_size, :nr_mappings, :mapping_policy, :dirty_percentage
+    switches :nr_cache_blocks, :uuid, :block_size, :nr_mappings,
+             :mapping_policy, :dirty_percentage, :policy
   end
 end
 
@@ -82,6 +84,7 @@ class Dispatcher
     b.nr_mappings = opts.fetch(:nr_mappings, 0)
     b.mapping_policy = opts.fetch(:mapping_policy, :random)
     b.dirty_percentage = opts.fetch(:dirty_percentage, 0)
+    b.policy_name = opts.fetch(:policy, 'mq')
     md = b.generate
     write_xml(md, STDOUT)
   end

data/features/cache_create.feature

@@ -4,7 +4,7 @@ Feature: I can create new metadata
     When I cache_xml create
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="0">
+    <superblock uuid="" block_size="128" nr_cache_blocks="0" policy="mq">
     </superblock>
     """
 
@@ -12,7 +12,7 @@ Feature: I can create new metadata
     When I cache_xml create --uuid 'one two three'
     Then the stdout should contain:
     """
-    <superblock uuid="one two three" block_size="128" nr_cache_blocks="0">
+    <superblock uuid="one two three" block_size="128" nr_cache_blocks="0" policy="mq">
     </superblock>
     """
 
@@ -20,7 +20,7 @@ Feature: I can create new metadata
     When I cache_xml create --block-size 512
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="512" nr_cache_blocks="0">
+    <superblock uuid="" block_size="512" nr_cache_blocks="0" policy="mq">
     </superblock>
     """
 
@@ -28,7 +28,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 345
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="345">
+    <superblock uuid="" block_size="128" nr_cache_blocks="345" policy="mq">
     </superblock>
     """
 
@@ -36,7 +36,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks uniform[123..124]
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="123">
+    <superblock uuid="" block_size="128" nr_cache_blocks="123" policy="mq">
     </superblock>
     """
 
@@ -44,7 +44,7 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="3">
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq">
       <mapping cache_block="0" origin_block="0" dirty="false"/>
       <mapping cache_block="1" origin_block="1" dirty="false"/>
       <mapping cache_block="2" origin_block="2" dirty="false"/>
@@ -55,11 +55,22 @@ Feature: I can create new metadata
     When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear --dirty-percent 100
     Then the stdout should contain:
     """
-    <superblock uuid="" block_size="128" nr_cache_blocks="3">
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="mq">
       <mapping cache_block="0" origin_block="0" dirty="true"/>
       <mapping cache_block="1" origin_block="1" dirty="true"/>
       <mapping cache_block="2" origin_block="2" dirty="true"/>
     </superblock>
     """
 
+  Scenario: Take the policy name
+    When I cache_xml create --nr-cache-blocks 3 --nr-mappings 3 --layout linear --policy fred
+    Then the stdout should contain:
+    """
+    <superblock uuid="" block_size="128" nr_cache_blocks="3" policy="fred">
+      <mapping cache_block="0" origin_block="0" dirty="false"/>
+      <mapping cache_block="1" origin_block="1" dirty="false"/>
+      <mapping cache_block="2" origin_block="2" dirty="false"/>
+    </superblock>
+    """
+    
     

data/lib/thinp_xml/cache/emit.rb

@@ -11,7 +11,7 @@ module CacheXML
       end
 
       def emit_superblock(sb, &block)
-        @e.emit_tag(sb, 'superblock', :uuid, :block_size, :nr_cache_blocks, &block)
+        @e.emit_tag(sb, 'superblock', :uuid, :block_size, :nr_cache_blocks, :policy, &block)
       end
 
       def emit_mapping(m)

data/lib/thinp_xml/cache/metadata.rb

@@ -2,7 +2,7 @@ module CacheXML
   SUPERBLOCK_FIELDS = [[:uuid, :string],
                        [:block_size, :int],
                        [:nr_cache_blocks, :int],
-                       [:policy_name, :string]]
+                       [:policy, :string]]
 
   MAPPING_FIELDS = [[:cache_block, :int],
                     [:origin_block, :int],

data/lib/thinp_xml/version.rb

@@ -1,3 +1,3 @@
 module ThinpXml
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/cache_builder_spec.rb

@@ -231,7 +231,6 @@ describe "CacheXML::Builder" do
 
         in_order.should be_false
       end
-
     end
   end
 end

metadata

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