tamiyo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a4830a9859afcba9035ce3defb78b6e8378bf5
-  data.tar.gz: 33970adda5c138a5e6acfe37507573ae90d78100
+  metadata.gz: 618214b3281617aedac786d889e18a10eb7bbc5f
+  data.tar.gz: 654aba2dd4153e722dbbd8362d030bb6b0547588
 SHA512:
-  metadata.gz: e5ab665d41dea84def8882ba64d124369207596e517e39991c873a65f14b67463ab9fe25e7f3301f8f511c173fd2fc42b489af3f523a4fd1f3c076302b961adb
-  data.tar.gz: eeb2d88c134bfb99cd1c32e0d0569337e5b2627975eeea42c2da3563407284b8783a01bf5662b0eac0ddf32171f79dc56bc8f9ae0209e35f1e8a418793f3dd8b
+  metadata.gz: 1c8222f4990cd353191dec4f803d7cabaf33f19f31e5686b2e9b0d8e2b10c580a47711526163f62f7b005075e72ac99e7f1950cf31e664ee5f1dfd75cd185076
+  data.tar.gz: 030b363179e31dd897532f5cb6cd02c4f811e1b169c13d30a8cb1eb453f7c40e536f7e9debb90a14539a92b739a28aa23eea509f8f0f647ab5cba603d2abdfb3

data/lib/tamiyo.rb

@@ -1,7 +1,15 @@
 require 'slop'
 
+gem_name = File.basename __FILE__, '.rb'
+
+def assuming_at_least(nr, args, opts)
+  valid = args.size >= nr
+  yield if valid && block_given?
+  puts opts unless valid
+end
+
 opts = Slop.new help: true do
-  banner "Usage: #{File.basename __FILE__} <command>"
+  banner "Usage: #{gem_name} [command]"
 
   command 'dummy-scrape' do
     run do |opts, args|
@@ -12,8 +20,9 @@ opts = Slop.new help: true do
 
   command 'gatherer-scrape' do
     run do |opts, args|
+      set = args.first || "Innistrad"
       require 'tamiyo/gatherer_scrape_chain'
-      Tamiyo::GathererScrapeChain.create(args.first || "Innistrad").pump
+      Tamiyo::GathererScrapeChain.create(set).pump
     end
   end
 
@@ -25,12 +34,29 @@ opts = Slop.new help: true do
   end
 
   command 'add-set' do
+    banner "Usage: #{gem_name} add-set [abbr] [set name]"
+    run do |opts, args|
+      assuming_at_least(2, args, opts) do
+        abbr = args.shift.upcase
+        name = args.join(' ')
+        puts "Adding set #{abbr} => #{name}"
+        require 'tamiyo/sets'
+        Tamiyo::Sets.add_custom_set abbr, name
+      end
+    end
+  end
+
+  command 'remove-set' do
+    banner "Usage: #{gem_name} remove-set [ [abbr] | --name [set name] ]"
+    on :n, :name, 'Remove set by full name instead of abbrevation'
+
     run do |opts, args|
-      require 'tamiyo/sets'
-      abbr = args.shift.upcase
-      name = args.join(' ')
-      puts "Adding set #{abbr} => #{name}"
-      Tamiyo::Sets.add_custom_set abbr, name
+      assuming_at_least(1, args, opts) do
+        name = opts.name? ? args.join(' ') : args.shift.upcase
+        puts "Removing set #{name}"
+        require 'tamiyo/sets'
+        Tamiyo::Sets.remove_custom_set name
+      end
     end
   end
 end

data/lib/tamiyo/cockatrice_db_sink.rb

@@ -1,11 +1,11 @@
 require 'nokogiri'
 require 'tamiyo/process'
 require 'tamiyo/data_store'
+require 'tamiyo/default_data'
 
 module Tamiyo
   class CockatriceDbSink
     include Process::Node
-    include DataStore
 
     def pump
       content = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
@@ -19,7 +19,7 @@ module Tamiyo
 
     def add_sets_to(xml)
       xml.sets {
-        default_set_data['sets'].each do |abbr, name|
+        DefaultData.sets['sets'].each do |abbr, name|
           xml.set {
             xml.name abbr
             xml.longname name
@@ -48,7 +48,8 @@ module Tamiyo
     end
 
     def store_xml(content)
-      path = provide_path_for 'cards.xml'
+      data_store = DataStore.new
+      path = data_store.path_for 'cards.xml'
       File.open(path, 'w') do |file|
         file.write content.to_xml
       end

data/lib/tamiyo/sets.rb

@@ -3,12 +3,36 @@ require 'tamiyo/yaml/yaml_helper'
 
 module Tamiyo
   class Sets
-    def self.add_custom_set abbr, name
-      @store ||= DataStore.new
-      data = @store.load_custom_sets
-      data['sets'] ||= {}
-      data['sets'].store abbr, name
-      @store.persist_custom_sets data
+    class << self
+      def add_custom_set(abbr, name)
+        @store ||= DataStore.new
+        data = @store.load_custom_sets
+        data['sets'] ||= {}
+        data['sets'].store abbr, name
+        @store.persist_custom_sets data
+      end
+
+      def remove_custom_set(name)
+        @store ||= DataStore.new
+        data = @store.load_custom_sets
+        modify_sets! data do |sets|
+          prune_set! sets, name
+        end
+        @store.persist_custom_sets data
+      end
+
+      def modify_sets!(data)
+        if block_given? && data.include?('sets')
+          yield data['sets']
+          data.delete 'sets' if data['sets'].empty?
+        end
+      end
+
+      def prune_set!(sets, name)
+        abbr = name.upcase
+        sets.delete(abbr) or
+        sets.delete_if { |_, value| value == name }
+      end
     end
   end
 end

data/lib/tamiyo/version.rb

@@ -1,3 +1,3 @@
 module Tamiyo
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/tamiyo/yaml/yaml_sink.rb

@@ -6,7 +6,6 @@ module Tamiyo
   module Yaml
     class YamlSink
       include Process::Node
-      include DataStore
       include YamlHelper
 
       def pump
@@ -30,7 +29,8 @@ module Tamiyo
       end
 
       def with_the_cards_file(&block)
-        file_name = provide_path_for 'cards.yaml'
+        store = DataStore.new
+        file_name = store.path_for 'cards.yaml'
         if block_given?
           File.open(file_name, 'w') do |file|
             within_a_yaml_document_of file, &block

data/lib/tamiyo/yaml/yaml_source.rb

@@ -8,7 +8,6 @@ module Tamiyo
     class YamlSource
       include Process::Node
       include YamlHelper
-      include DataStore
 
       def pull
         using_object [] do |cards|
@@ -52,7 +51,8 @@ module Tamiyo
       end
 
       def with_the_cards_file
-        path = provide_path_for 'cards.yaml'
+        data_store = DataStore.new
+        path = data_store.path_for 'cards.yaml'
         if block_given?
           File.open(path, 'r') do |file|
             yield yaml_event_stream_for file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tamiyo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Roger Norling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler