rbdash 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bd45279cad296b0dc993904fa6bfc2ee3cf5089
-  data.tar.gz: 2db662d897905f8bc1949191c3e759b937905706
+  metadata.gz: bb38bbb5168551aa34c9d8b19a7365257c5eafc0
+  data.tar.gz: 797eab469029bd4e9f82489b8f51513e24574104
 SHA512:
-  metadata.gz: 2aa862983c38f4af37dda8abab348bcca917b3dd2ea4a7caf8991ee6242d196310a16b582bd5de296bd94f83e4f5cef19434f5cfff1ac84185ecdfd552af6649
-  data.tar.gz: 9c140bb5f4c5cce93e7b57c82662c7b0106be23b5736ae16e9f7ad819993ddfa83bdbdea5684dfd6f9d27566efe8c25f67d5320fa04da7c44c86f02340110962
+  metadata.gz: c05f284cbae5b8cb5749b1aea82de9af83ba3267daa26bbe6d7a53b32f1c2fe0dd86827929a56eb66a3585cee2432ba0b4f6be62ca903471de884ed8f1e1e2ee
+  data.tar.gz: 0a5127285700d4401575ca46cc3ee4ccfd207c69f31db3abda15f7d0505b9fc635133a31eeec92af6fe74cc2a30a0059684a45693b17d420c23df7b73a280d0e

data/lib/rbdash.rb

@@ -1,9 +1,9 @@
 require 'rbdash/version'
 
 module Rbdash
+  require 'rbdash/utils'
   require 'rbdash/cli'
   require 'rbdash/cli/pull'
   require 'rbdash/cli/push'
-  require 'rbdash/cli/push_all'
   require 'rbdash/models/query'
 end

data/lib/rbdash/cli.rb

@@ -3,6 +3,8 @@ require 'thor'
 module Rbdash
   class CLI < Thor
     include Thor::Actions
+    OPT_DRY_RUN = 'dry-run'.freeze
+    OPT_ALL = 'all'.freeze
 
     desc 'init', 'create a configuration file.'
     def init
@@ -13,26 +15,50 @@ module Rbdash
       end
     end
 
-    desc 'pull', 'pulls existing configurations.'
-    method_option 'dry-run'
-    def pull
-      CLI::Pull.new.run
+    desc 'pull <id1> <id2> ... [options]', 'pulls existing remote configurations.'
+    method_option OPT_DRY_RUN
+    method_option OPT_ALL
+    def pull(*ids)
+      if all? && !ids.empty?
+        puts "'CONFLICT: Cannot assign ids with --#{OPT_ALL} option.'"
+        return
+      end
+      if !all? && ids.empty?
+        puts "'You may pass either ids or --#{OPT_ALL} option.'"
+        return
+      end
+
+      CLI::Pull.new.run(*ids, command_options)
     end
 
-    desc 'push <id1> <id2> ...', 'push configurations'
-    method_option 'dry-run'
+    desc 'push <id1> <id2> ... [options]', 'push local configurations to remote.'
+    method_option OPT_DRY_RUN
+    method_option OPT_ALL
     def push(*ids)
-      if options['dry-run']
-        CLI::Push.new.dry_run(*ids)
+      if all? && !ids.empty?
+        puts "'CONFLICT: Cannot assign ids with --#{OPT_ALL} option.'"
+        return
+      end
+      if !all? && ids.empty?
+        puts "'You may pass either ids or --#{OPT_ALL} option.'"
         return
       end
-      CLI::Push.new.run(*ids)
+
+      CLI::Push.new.run(*ids, command_options)
+    end
+
+    private
+
+    def command_options
+      { is_all: all?, is_dry: dry? }
+    end
+
+    def dry?
+      options[OPT_DRY_RUN]
     end
 
-    desc 'push_all', 'push all configurations'
-    method_option 'dry-run'
-    def push_all
-      CLI::PushAll.new.run
+    def all?
+      options[OPT_ALL]
     end
   end
 end

data/lib/rbdash/cli/pull.rb

@@ -1,8 +1,39 @@
 module Rbdash
   class CLI::Pull
-    def run
-      queries = Rbdash::Models::Query.find_all
-      queries.each(&:save)
+    def run(*ids, **options)
+      # find remote queries
+      queries = if options[:is_all]
+                  Rbdash::Models::Query.find_all
+                else
+                  ids.map do |id|
+                    Rbdash::Models::Query.find(id)
+                  end
+                end
+      # save
+      queries.each do |query|
+        show_diff(query)
+        next if options[:is_dry]
+
+        # update local states
+        query.save
+      end
+    end
+
+    private
+
+    def show_diff(query)
+      id = query.id
+      local_state = Rbdash::Models::Query.load(id)
+      diff = Diffy::Diff.new(local_state.to_json, query.to_json, diff_opt).to_s(:color)
+
+      unless diff.chomp.empty?
+        puts "[changed] #{id}"
+        puts diff
+      end
+    end
+
+    def diff_opt
+      { include_diff_info: true, context: 2 }
     end
   end
 end

data/lib/rbdash/cli/push.rb

@@ -1,17 +1,14 @@
 require 'diffy'
 module Rbdash
   class CLI::Push
-
-    def run(*ids)
+    def run(*ids, **options)
+      ids = Utils.find_local_ids if options[:is_all]
       ids.each do |id|
         show_diff(id)
-        update(id)
-      end
-    end
+        next if options[:is_dry]
 
-    def dry_run(*ids)
-      ids.each do |id|
-        show_diff(id)
+        # update remote resources
+        update(id)
       end
     end
 
@@ -24,7 +21,12 @@ module Rbdash
     def show_diff(id)
       remote_state = Rbdash::Models::Query.find(id)
       local_state = Rbdash::Models::Query.load(id)
-      puts Diffy::Diff.new(remote_state.to_json, local_state.to_json, diff_opt).to_s(:color)
+      diff = Diffy::Diff.new(remote_state.to_json, local_state.to_json, diff_opt).to_s(:color)
+
+      unless diff.chomp.empty?
+        puts "[changed] #{id}"
+        puts diff
+      end
     end
 
     def diff_opt

data/lib/rbdash/models/base_model.rb

@@ -3,10 +3,11 @@ require_relative '../request'
 module Rbdash
   module Models
     class BaseModel
-      attr_accessor :body
+      attr_accessor :body, :id
 
-      def initialize(body)
+      def initialize(body, id)
         @body = body
+        @id = id
       end
 
       def to_json
@@ -14,7 +15,6 @@ module Rbdash
       end
 
       def save
-        id = @body['id']
         dirname = self.class.dirname
         Dir.mkdir(dirname) unless File.exist?(dirname)
         filename = "#{dirname}/query-#{id}.json"
@@ -37,7 +37,7 @@ module Rbdash
           end
           h = JSON.parse(response.body)
           body = h.select { |k, _| attributes.map(&:to_s).include?(k) }
-          new(body)
+          new(body, id)
         end
 
         def find_all
@@ -52,7 +52,8 @@ module Rbdash
             results = h['results']
             all_results += results.map do |result|
               body = result.select { |k, _| attributes.map(&:to_s).include?(k) }
-              new(body)
+              id = result['id']
+              new(body, id)
             end
 
             count = h['count']
@@ -76,10 +77,10 @@ module Rbdash
         end
 
         def load(id)
-          file = Dir.glob("#{dirname}/query-#{id}.json").first
-          raise StandardError, 'id not found' unless file
+          file = Utils.find_local_file(id)
+          return new(nil, id) unless file
           body = JSON.parse(File.read(file))
-          new(body)
+          new(body, id)
         end
       end
     end

data/lib/rbdash/models/query.rb

@@ -5,7 +5,6 @@ module Rbdash
     class Query < BaseModel
       def self.attributes
         [
-          :id,             # number
           :data_source_id, # number
           :query,          # string
           :name,           # string

data/lib/rbdash/utils.rb

@@ -0,0 +1,15 @@
+module Rbdash
+  module Utils
+    class << self
+      def find_local_ids
+        Dir.glob('queries/*').map do |f|
+          f.match(/\d+/)[0]
+        end
+      end
+
+      def find_local_file(id)
+        Dir.glob("queries/query-#{id}.json").first
+      end
+    end
+  end
+end

data/lib/rbdash/version.rb

@@ -1,3 +1,3 @@
 module Rbdash
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbdash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - shotat
@@ -129,10 +129,10 @@ files:
 - lib/rbdash/cli.rb
 - lib/rbdash/cli/pull.rb
 - lib/rbdash/cli/push.rb
-- lib/rbdash/cli/push_all.rb
 - lib/rbdash/models/base_model.rb
 - lib/rbdash/models/query.rb
 - lib/rbdash/request.rb
+- lib/rbdash/utils.rb
 - lib/rbdash/version.rb
 - local_install.sh
 - rbdash.gemspec

data/lib/rbdash/cli/push_all.rb

@@ -1,13 +0,0 @@
-module Rbdash
-  class CLI::PushAll
-    def run
-      ids = Dir.glob('queries/*').map do |f|
-        f.match(/\d+/)[0]
-      end
-      ids.each.map do |id|
-        Rbdash::Models::Query.update(id)
-      end
-    end
-  end
-end
-