dashdog 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd9f5b8483bb4fc4ab8b73b881f6dcb61e4044a
-  data.tar.gz: bbda047cb690cb840671b4a67f3609f7ebb49cab
+  metadata.gz: e5a209f39a8e469b2ff1a4ae3c37c9ef0f29a9fe
+  data.tar.gz: 75e706697dfad0acaf3bd8e2cf0a34820d5d2a19
 SHA512:
-  metadata.gz: ec7c47d5d7cee288898c25d011fe61a5dab41a21182693bef17bbf5fd229aab910b4833d056b182120044b49a1ba31a746a0c6ded30955d71615d04b043356a2
-  data.tar.gz: 5595e13d9e51c71daf046e80e26c22363a86516e193a62a13c67b29ab8f9d15d956d1d1c374c2ed445b008f8589c1389bc3937bdafbb83168cf6990f14a9bd84
+  metadata.gz: 382cca04591f69297f3bbc7b41ec2c736bf03f52ee9be2486f4f09b552bb3d0c66a13e2c00358e95f8c4ba01180b9172a76ae3c16d7e5021225a52c56d548bc0
+  data.tar.gz: 11c397cdfedf957a1f9fd38b2aa83ccf80a62b0a8656a4ab07139f82dfa07d6a8c40c5da1ccab1fe1f937815fadd75ad88dd66927085714e20f9c86d6e6c893b

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 /vendor
 .envrc
+Boardfile
+/*.rb

data/CHANGELOG.md

@@ -1,9 +1,13 @@
+## 0.2.0
+
+- Add `split` opton [#4][] ([@winebarrel][])
+
 ## 0.1.1
 
 - Add color option / check stdout tty [#3][] ([@winebarrel][])
 - Use parallel for speeding up [#2][] ([@winebarrel][])
 - Bugfix: Error occurs when widgets is nil. [#1][] ([@winebarrel][])
-- Fix strange diff colorize
+- Fix a strange diff colorize
 
 ## 0.1.0
 
@@ -13,4 +17,5 @@
 [#1]: https://github.com/serverworks/dashdog/issues/1
 [#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

data/README.md

@@ -55,6 +55,7 @@ Usage:
 
 Options:
   -w, [--write], [--no-write]  # Write the configuration to the file
+      [--split], [--no-split]  # Split configuration file
   -f, [--file=FILE]            # Configuration file
                                # Default: Boardfile
       [--color], [--no-color]  # Disable colorize

data/lib/dashdog/actions.rb

@@ -13,18 +13,23 @@ module Dashdog
     def export(options)
       dsl = @converter.timeboards_to_dsl(@client.get_timeboards)
       dsl << @converter.screenboards_to_dsl(@client.get_screenboards)
-      Dashdog::Utils.print_ruby(dsl, color: options[:color])
-      File.write(options['file'], dsl) if options['write']
+      if options['write']
+        _export_to_file(dsl, options)
+      else
+        Dashdog::Utils.print_ruby(dsl, color: options[:color])
+      end
     end
 
     def apply(options)
       dry_run = options['dry_run'] ? '[Dry run] ' : ''
-      conf = @converter.to_h(File.read(options['file']))
+      conf = @converter.to_h(options['file'])
 
       _apply_timeboards(conf['timeboards'], @client.get_timeboards, dry_run)
       _apply_screenboards(conf['screenboards'], @client.get_screenboards, dry_run)
     end
 
+    private
+
     def _apply_timeboards(local, remote, dry_run)
       local.each do |l|
         r = _choice_by_title(remote, l['title'])
@@ -95,5 +100,31 @@ module Dashdog
       nil
     end
 
+    def _export_to_file(dsl, options)
+      file = options['file']
+
+      if options['split']
+        dsls = dsl.strip.split(/^(timeboard|screenboard)\b/).slice(1..-1).each_slice(2).map(&:join)
+        requires = []
+
+        dsls.each do |splitted|
+          splitted.strip!
+          title = splitted.each_line.first.strip.gsub(/\A(?:timeboard|screenboard)\s+"([^"]+)"\s+do/, '\\1')
+          title.gsub!(/\W+/, '_')
+          requires << title
+          File.write("#{title}.rb", splitted + "\n")
+          info("Write '#{title}.rb'")
+        end
+
+        open(file, 'w') do |f|
+          requires.each {|r| f.puts "require #{r.inspect}" }
+        end
+
+        info("Write '#{file}'")
+      else
+        File.write(file, dsl)
+        info("Write '#{file}'")
+      end
+    end
   end
 end

data/lib/dashdog/cli.rb

@@ -12,6 +12,7 @@ module Dashdog
 
     desc "export", "Export the dashboard configurations"
     option :write, aliases: '-w', desc: 'Write the configuration to the file', type: :boolean, default: false
+    option :split, desc: 'Split configuration file', type: :boolean, default: false
     def export
       @actions.export(options)
     end

data/lib/dashdog/converter.rb

@@ -60,13 +60,26 @@ EOS
       ret
     end
 
-    def to_h(dsl)
-      instance_eval(dsl)
+    def to_h(dsl_file)
+      @_dsl_file = dsl_file
+      instance_eval(File.read(dsl_file), dsl_file)
       @boards
     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,

data/lib/dashdog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashdog
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Serverworks Co.,Ltd.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi