rbdash 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0032fd88d5487c15247c31d98ae4883afbd0379
-  data.tar.gz: e5ad4dab9923fc3d2d0479e7c62d4b9d5eca362d
+  metadata.gz: 7bd45279cad296b0dc993904fa6bfc2ee3cf5089
+  data.tar.gz: 2db662d897905f8bc1949191c3e759b937905706
 SHA512:
-  metadata.gz: c645b8f82347177df23f5fb563f8da5b1fb080b58f83207453c3fcec1756a524f3b13f92d09304c284c6670fca4228ed3ec9bf83cd4821cd5fa605bf48b8746e
-  data.tar.gz: 8c767ed9ce5873cd2bbeca816cfc23ce66edb7c20630c5bcc130fcfe0e02ae62c507f62e440720aedf64096a62f6067527376ce6d24f35fd3a79e36284d2361d
+  metadata.gz: 2aa862983c38f4af37dda8abab348bcca917b3dd2ea4a7caf8991ee6242d196310a16b582bd5de296bd94f83e4f5cef19434f5cfff1ac84185ecdfd552af6649
+  data.tar.gz: 9c140bb5f4c5cce93e7b57c82662c7b0106be23b5736ae16e9f7ad819993ddfa83bdbdea5684dfd6f9d27566efe8c25f67d5320fa04da7c44c86f02340110962

data/.gitignore

@@ -9,7 +9,7 @@
 /tmp/
 
 queries
-config.yml
+.rbdash.yml
 
 # rspec failure tracking
 .rspec_status

data/README.md

@@ -1,10 +1,9 @@
-NOTE: work in progress. :construction_worker:
 
 # Rbdash
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rbdash`. To experiment with that code, run `bin/console` for an interactive prompt.
+Rbdash is a configuration management CLI tool for [Redash](https://redash.io/).
 
-TODO: Delete this and the text above, and describe your gem
+NOTE: work in progress. :construction_worker:
 
 ## Installation
 
@@ -24,7 +23,30 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+
+#### setup
+
+```sh
+$ rbdash init
+      create  config_test.yml
+Type your redash server uri: https://example.redash.com
+Type your redash API token: xxxxxxxxxxxxxxxx
+```
+
+#### fetch remote configurations
+
+```sh
+$ rbdash pull
+#   create queries/query-1.json
+#   create queries/query-2.json
+#   ...
+```
+
+#### push configs to remote
+
+```
+$ rbdash push <id>
+```
 
 ## Development
 
@@ -34,4 +56,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rbdash.
+Bug reports and pull requests are welcome on GitHub at https://github.com/shotat/rbdash.

data/lib/rbdash/cli.rb

@@ -6,7 +6,7 @@ module Rbdash
 
     desc 'init', 'create a configuration file.'
     def init
-      create_file 'config.yml' do
+      create_file '.rbdash.yml' do
         base_uri = ask('Type your redash server uri:')
         token = ask('Type your redash API token:')
         "base_uri: #{base_uri}\ntoken: #{token}"
@@ -14,17 +14,23 @@ module Rbdash
     end
 
     desc 'pull', 'pulls existing configurations.'
+    method_option 'dry-run'
     def pull
       CLI::Pull.new.run
     end
 
+    desc 'push <id1> <id2> ...', 'push configurations'
     method_option 'dry-run'
-    desc 'push <id>', 'push configurations'
-    def push(id)
-      CLI::Push.new.run(id)
+    def push(*ids)
+      if options['dry-run']
+        CLI::Push.new.dry_run(*ids)
+        return
+      end
+      CLI::Push.new.run(*ids)
     end
 
     desc 'push_all', 'push all configurations'
+    method_option 'dry-run'
     def push_all
       CLI::PushAll.new.run
     end

data/lib/rbdash/cli/push.rb

@@ -1,8 +1,34 @@
+require 'diffy'
 module Rbdash
   class CLI::Push
-    def run(id)
+
+    def run(*ids)
+      ids.each do |id|
+        show_diff(id)
+        update(id)
+      end
+    end
+
+    def dry_run(*ids)
+      ids.each do |id|
+        show_diff(id)
+      end
+    end
+
+    private
+
+    def update(id)
       Rbdash::Models::Query.update(id)
-      puts 'complete!'
+    end
+
+    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)
+    end
+
+    def diff_opt
+      { include_diff_info: true, context: 2 }
     end
   end
 end

data/lib/rbdash/request.rb

@@ -8,7 +8,8 @@ module Rbdash
     # debug_output $stdout
 
     def initialize
-      config = YAML.load_file('./config.yml')
+      conf_file = './.rbdash.yml'
+      config = YAML.load_file(conf_file)
       self.class.base_uri(config['base_uri'])
       @default_options = {
         verify: false,

data/lib/rbdash/version.rb

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

data/local_install.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+gem_name='rbdash'
+version=$(grep VERSION lib/rbdash/version.rb | grep -Eo '\d+\.\d+.\d+')
+rake build
+gem install "pkg/${gem_name}-${version}.gem"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbdash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - shotat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -124,7 +124,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- config.sample.yml
 - exe/rbdash
 - lib/rbdash.rb
 - lib/rbdash/cli.rb
@@ -135,6 +134,7 @@ files:
 - lib/rbdash/models/query.rb
 - lib/rbdash/request.rb
 - lib/rbdash/version.rb
+- local_install.sh
 - rbdash.gemspec
 homepage: https://github.com/shotat/rbdash
 licenses: []

data/config.sample.yml

@@ -1,2 +0,0 @@
-base_uri: 'example.com'
-token: 'xxxxxxxxxxxxxxxxxxxxxxxxxx'