dashdog 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a209f39a8e469b2ff1a4ae3c37c9ef0f29a9fe
-  data.tar.gz: 75e706697dfad0acaf3bd8e2cf0a34820d5d2a19
+  metadata.gz: f6f386b275c48a47a0045b7185fecde628df9559
+  data.tar.gz: 004b08212a20a2e55a4cd9ce36c0d1af6d09ab1b
 SHA512:
-  metadata.gz: 382cca04591f69297f3bbc7b41ec2c736bf03f52ee9be2486f4f09b552bb3d0c66a13e2c00358e95f8c4ba01180b9172a76ae3c16d7e5021225a52c56d548bc0
-  data.tar.gz: 11c397cdfedf957a1f9fd38b2aa83ccf80a62b0a8656a4ab07139f82dfa07d6a8c40c5da1ccab1fe1f937815fadd75ad88dd66927085714e20f9c86d6e6c893b
+  metadata.gz: 60b4e24201a7b27f245992f3b296de39fcd1c070e02a44203a498e79d683bd086ee4d9b476a43edc254d92d968fba6a334af7bac81a2d5d54c6a650965cb1ea9
+  data.tar.gz: ce8b1718de7432e021e6d4240ddf85be9396ac6ab0144bfc0624735d30342dee8daa49c9ff958e0dbe45ee888a66af50bfe5dd7f58f5bf1c23e4c6bb617ee5c3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0
+
+- Add template support [#5][] ([@winebarrel][])
+- Diff the sorted json [#6][] ([@winebarrel][])
+
 ## 0.2.0
 
 - Add `split` opton [#4][] ([@winebarrel][])
@@ -18,4 +23,6 @@
 [#2]: https://github.com/serverworks/dashdog/issues/2
 [#3]: https://github.com/serverworks/dashdog/issues/3
 [#4]: https://github.com/serverworks/dashdog/issues/4
-[@winebarrel]: https://github.com/winebarrel
+[#5]: https://github.com/serverworks/dashdog/issues/5
+[#6]: https://github.com/serverworks/dashdog/issues/6
+[@winebarrel]: https://github.com/winebarrel

data/dashdog.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dogapi"
-  spec.add_dependency "dslh", "~> 0.3.8"
+  spec.add_dependency "dslh", "~> 0.3.9"
   spec.add_dependency "thor", "~> 0.19.1"
   spec.add_dependency "coderay"
   spec.add_dependency "diffy"
   spec.add_dependency "parallel"
+  spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dashdog.rb

@@ -6,6 +6,7 @@ require "dashdog/client"
 require "dashdog/converter"
 require "dashdog/actions"
 require "dashdog/cli"
+require "dashdog/dsl_context"
 
 module Dashdog
   # Your code goes here...

data/lib/dashdog/converter.rb

@@ -61,40 +61,8 @@ EOS
     end
 
     def to_h(dsl_file)
-      @_dsl_file = dsl_file
-      instance_eval(File.read(dsl_file), dsl_file)
-      @boards
+      context = DSLContext.new
+      context.eval_dsl(dsl_file)
     end
-
-    private
-
-    def require(file)
-      boardfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@_dsl_file), file))
-
-      if File.exist?(boardfile)
-        instance_eval(File.read(boardfile), boardfile)
-      elsif File.exist?(boardfile + '.rb')
-        instance_eval(File.read(boardfile + '.rb'), boardfile + '.rb')
-      else
-        Kernel.require(file)
-      end
-    end
-
-    def timeboard(value = nil, &block)
-      hash = Dslh.eval(
-        allow_empty_args: true,
-        &block)
-      hash['title'] = value
-      @boards['timeboards'] << hash
-    end
-
-    def screenboard(value = nil, &block)
-      hash = Dslh.eval(
-        allow_empty_args: true,
-        &block)
-      hash['board_title'] = value
-      @boards['screenboards'] << hash
-    end
-
   end
 end

data/lib/dashdog/dsl_context.rb

@@ -0,0 +1,78 @@
+require 'hashie'
+
+module Dashdog
+  class DSLContext
+    def initialize
+      @boards = {'timeboards' => [], 'screenboards' => []}
+      @templates = {}
+      @context = Hashie::Mash.new()
+    end
+
+    def eval_dsl(dsl_file)
+      @_dsl_file = dsl_file
+      instance_eval(File.read(dsl_file), dsl_file)
+      @boards
+    end
+
+    private
+
+    def template(name, &block)
+      @templates[name.to_s] = block
+    end
+
+    def context
+      @context
+    end
+
+    def require(file)
+      boardfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@_dsl_file), file))
+
+      if File.exist?(boardfile)
+        instance_eval(File.read(boardfile), boardfile)
+      elsif File.exist?(boardfile + '.rb')
+        instance_eval(File.read(boardfile + '.rb'), boardfile + '.rb')
+      else
+        Kernel.require(file)
+      end
+    end
+
+    def timeboard(value = nil, &block)
+      hash = dslh_eval(block)
+      hash['title'] = value
+      @boards['timeboards'] << hash
+    end
+
+    def screenboard(value = nil, &block)
+      hash = dslh_eval(block)
+      hash['board_title'] = value
+      @boards['screenboards'] << hash
+    end
+
+    def dslh_eval(block)
+      scope_hook = proc do |scope|
+        scope.instance_eval(<<-'EOS')
+          def include_template(template_name, context = {})
+            tmplt = @templates[template_name.to_s]
+
+            unless tmplt
+              raise "Template '#{template_name}' is not defined"
+            end
+
+            context_orig = @context
+            @context = @context.merge(context)
+            instance_eval(&tmplt)
+            @context = context_orig
+          end
+
+          def context
+            @context
+          end
+        EOS
+      end
+
+      scope_vars = {templates: @templates, context: @context}
+
+      Dslh.eval(allow_empty_args: true, scope_hook: scope_hook, scope_vars: scope_vars, &block)
+    end
+  end
+end

data/lib/dashdog/utils.rb

@@ -7,8 +7,8 @@ module Dashdog
 
     def self.diff(hash1, hash2)
       Diffy::Diff.new(
-        JSON.pretty_generate(hash1),
-        JSON.pretty_generate(hash2),
+        JSON.pretty_generate(self.deep_sort_hash(hash1)) + "\n",
+        JSON.pretty_generate(self.deep_sort_hash(hash2)) + "\n",
         :diff => '-u'
       ).to_s(:color)
     end
@@ -31,5 +31,24 @@ module Dashdog
     def self.print_json(json)
       puts CodeRay.scan(json, :json).terminal
     end
+
+    def self.deep_sort_hash(obj)
+      case obj
+      when Hash
+        new_hash = {}
+
+        obj.sort_by{|k, _| k.to_s }.each do |key, value|
+          new_hash[key] = self.deep_sort_hash(value)
+        end
+
+        new_hash
+      when Array
+        obj.map do |value|
+          self.deep_sort_hash(value)
+        end
+      else
+        obj
+      end
+    end
   end
 end

data/lib/dashdog/version.rb

@@ -1,3 +1,3 @@
 module Dashdog
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashdog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Serverworks Co.,Ltd.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.9
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - lib/dashdog/cli.rb
 - lib/dashdog/client.rb
 - lib/dashdog/converter.rb
+- lib/dashdog/dsl_context.rb
 - lib/dashdog/logger.rb
 - lib/dashdog/utils.rb
 - lib/dashdog/version.rb