rbdash 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb38bbb5168551aa34c9d8b19a7365257c5eafc0
-  data.tar.gz: 797eab469029bd4e9f82489b8f51513e24574104
+  metadata.gz: a70157bd60ff7dd8f091486112e2ab2f9b9cfe09
+  data.tar.gz: 3a170b20e50a49b088e385ec5744c6fd4e1d0e9d
 SHA512:
-  metadata.gz: c05f284cbae5b8cb5749b1aea82de9af83ba3267daa26bbe6d7a53b32f1c2fe0dd86827929a56eb66a3585cee2432ba0b4f6be62ca903471de884ed8f1e1e2ee
-  data.tar.gz: 0a5127285700d4401575ca46cc3ee4ccfd207c69f31db3abda15f7d0505b9fc635133a31eeec92af6fe74cc2a30a0059684a45693b17d420c23df7b73a280d0e
+  metadata.gz: 1892e5efbd305b25cec00fbf714f6852001571476bb48c2f1787fe55068e0daaa6671f1b2402e22c8d373dad08ac3933383914e4cf474f8de9af806a90167cac
+  data.tar.gz: 117d08dc1f1be3303c09e80ec16ed5642b624f58f74fa2ed38fb8d5cd5dcf792cb49e26d6d706fdbe904ab87f50984b194e843c6b5591b4ef313a3386d9df260

data/README.md

@@ -3,8 +3,6 @@
 
 Rbdash is a configuration management CLI tool for [Redash](https://redash.io/).
 
-NOTE: work in progress. :construction_worker:
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -36,7 +34,7 @@ Type your redash API token: xxxxxxxxxxxxxxxx
 #### fetch remote configurations
 
 ```sh
-$ rbdash pull
+$ rbdash pull <id> <id> ... [--dry-run] [--all]
 #   create queries/query-1.json
 #   create queries/query-2.json
 #   ...
@@ -45,7 +43,7 @@ $ rbdash pull
 #### push configs to remote
 
 ```
-$ rbdash push <id>
+$ rbdash push <id> <id> ... [--dry-run] [--all]
 ```
 
 ## Development

data/lib/rbdash/cli.rb

@@ -19,6 +19,11 @@ module Rbdash
     method_option OPT_DRY_RUN
     method_option OPT_ALL
     def pull(*ids)
+      unless Utils.config_exist?
+        puts 'Cannot locate .rbdash.yml in the current directory.'
+        return
+      end
+
       if all? && !ids.empty?
         puts "'CONFLICT: Cannot assign ids with --#{OPT_ALL} option.'"
         return
@@ -35,6 +40,11 @@ module Rbdash
     method_option OPT_DRY_RUN
     method_option OPT_ALL
     def push(*ids)
+      unless Utils.config_exist?
+        puts 'Cannot locate .rbdash.yml in the current directory.'
+        return
+      end
+
       if all? && !ids.empty?
         puts "'CONFLICT: Cannot assign ids with --#{OPT_ALL} option.'"
         return

data/lib/rbdash/models/base_model.rb

@@ -50,10 +50,11 @@ module Rbdash
             end
             h = JSON.parse(response.body)
             results = h['results']
-            all_results += results.map do |result|
+            all_results += results.reduce([]) do |acc, result|
+              next acc if result['is_archived'] || result['is_draft']
               body = result.select { |k, _| attributes.map(&:to_s).include?(k) }
               id = result['id']
-              new(body, id)
+              acc << new(body, id)
             end
 
             count = h['count']

data/lib/rbdash/utils.rb

@@ -10,6 +10,10 @@ module Rbdash
       def find_local_file(id)
         Dir.glob("queries/query-#{id}.json").first
       end
+
+      def config_exist?
+        !Dir.glob('.rbdash.yml').empty?
+      end
     end
   end
 end

data/lib/rbdash/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbdash
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - shotat