refocus 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ed3e20b9196f523eba596e90b964b934c75821
-  data.tar.gz: da43515dff536896a48386c0b0ce3253331a5cd3
+  metadata.gz: 29e511a576db53916cd93b5a32c1fbb62b2171e5
+  data.tar.gz: 975c4fa9a9ddd4935253e1b44d9e63cbef97f706
 SHA512:
-  metadata.gz: 2d4d1a12437f12ab40e5e5fc65a95a3ead2c525afb063693ebeac013d4e70302e2f34a869197670cb49923157d3f0eb6f13c6bac0ab9e8a3b2823f7aa47b118a
-  data.tar.gz: fc8fbc5ac39b097731656e94521bd704fa8a547f70dcd577727ab168df8baba37b54a4b054a19e184b91623e36d31610be5b46a9e048226171b534877f36ddb4
+  metadata.gz: 555c420afa099c429ec8e2aa4a235df161a2b9845f5aa5610423c3196a47578b77d82e46fb79476ceb8fa4ee8b37673cab1fa2609a9899a163fdb5fe7a67bd43
+  data.tar.gz: 8c0f72d975a9434ba1b857536ee7f541d90a46437bd0f0cd070c4e1b7586691db73823dedf01a4743a8e161f5cce447da7a74d72f634fe587165214556d3353e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    refocus (0.1.2)
+    refocus (0.1.3)
       clamp
       excon
 

data/README.md

@@ -24,8 +24,6 @@ Or install it yourself as:
 ## Usage
 
 ### CLI
-
-Run
 ```
 Usage:
     refocus [OPTIONS] SUBCOMMAND [ARG] ...
@@ -43,19 +41,19 @@ Options:
 
 ### Library
 
-Refocus will pick up `REFOCUS_HOST` and `REFOCUS_API_TOKEN` environment vars if these are set.
+Refocus will pick up `REFOCUS_URL` and `REFOCUS_API_TOKEN` environment vars if these are set.
 You can create a client like this in a `pry` or `irb` session, or in your ruby program:
 
 ```ruby
 require "refocus"
 
-# Using env vars. This will fail if REFOCUS_HOST and REFOCUS_API_TOKEN are unset:
+# Using env vars. This will fail if REFOCUS_URLand REFOCUS_API_TOKEN are unset:
 refocus = Refocus.client
 
 # Doing it yourself:
 refocus = Refocus.client(url: "https://my.refocus.instance.com", token: "some-token-i-generated")
 ```
-### Subjects
+#### Subjects
 
 You can manage subjects like this:
 
@@ -73,7 +71,7 @@ refocus.subjects.all
 refocus.subjects.delete(name: "my-subject.child-subject")
 ```
 
-### Aspects
+#### Aspects
 
 You can manage aspects like this:
 
@@ -88,7 +86,7 @@ refocus.aspects.get(name: "my-aspect")
 refocus.aspects.delete(name: "my-aspect")
 ```
 
-### Lenses
+#### Lenses
 
 Lenses are not supported at this time.
 

data/lib/refocus.rb

@@ -2,7 +2,7 @@ require "refocus/client"
 require "refocus/version"
 
 module Refocus
-  def self.client(url: "https://#{ENV.fetch("REFOCUS_HOST")}", token: ENV.fetch("REFOCUS_API_TOKEN"))
+  def self.client(url: ENV.fetch("REFOCUS_URL"), token: ENV.fetch("REFOCUS_API_TOKEN"))
     Client.new(url: url, token: token)
   end
 end

data/lib/refocus/cli.rb

@@ -6,4 +6,7 @@ module Refocus
 end
 
 require "refocus/cli/samples"
+require "refocus/cli/resources"
+require "refocus/cli/aspects"
+require "refocus/cli/subjects"
 

data/lib/refocus/cli/aspects.rb

@@ -0,0 +1,18 @@
+module Refocus
+  class AspectsDeleteCommand< Clamp::Command
+    parameter "ASPECT", "aspect to delete"
+
+    def execute
+      refocus.aspects.delete(name: aspect)
+    end
+
+    def refocus
+      Refocus.client
+    end
+  end
+
+  Cli.class_eval do
+    subcommand "aspects:delete", "Delete an aspect", Refocus::AspectsDeleteCommand
+  end
+end
+

data/lib/refocus/cli/resources.rb

@@ -0,0 +1,51 @@
+require "refocus/cli"
+require "json"
+require "yaml"
+
+module Refocus
+  class ResourcesSyncCommand < Clamp::Command
+
+    option(["-a", "--action"], "ACTION", "action to perform: create or update", default: "create") do |s|
+      (raise ArgumentError, "Invalid action: #{s}") unless %w{create update}.include?(s)
+      s.to_sym
+    end
+
+    def execute
+      subjects.each do |subject|
+        refocus.subjects.send(action, {
+          name: subject.fetch("name"),
+          options: subject.fetch("properties")
+        })
+      end
+
+      aspects.each do |aspect|
+        refocus.aspects.send(action, {
+          name: aspect.fetch("name"),
+          options: aspect.fetch("properties")
+        })
+      end
+    end
+
+    def input
+      @input ||= YAML.safe_load(STDIN.read)
+    end
+
+    def subjects
+      input["subjects"] || []
+    end
+
+    def aspects
+      input["aspects"] || []
+    end
+
+    def refocus
+      Refocus.client
+    end
+  end
+
+  Cli.class_eval do
+    subcommand "resources:sync", "Create refocus resources from STDIN", ResourcesSyncCommand
+  end
+end
+
+

data/lib/refocus/cli/subjects.rb

@@ -0,0 +1,18 @@
+module Refocus
+  class SubjectsDeleteCommand< Clamp::Command
+    parameter "SUBJECT", "subject to delete"
+
+    def execute
+      refocus.subjects.delete(name: subject)
+    end
+
+    def refocus
+      Refocus.client
+    end
+  end
+
+  Cli.class_eval do
+    subcommand "subjects:delete", "Delete a subject", Refocus::SubjectsDeleteCommand
+  end
+end
+

data/lib/refocus/errors.rb

@@ -0,0 +1,9 @@
+module Refocus
+  class ApiError < StandardError
+    attr_reader :json
+    def initialize(json)
+      @json = json
+      super("#{json["errors"].first["message"]}:#{json["errors"].first["description"]}")
+    end
+  end
+end

data/lib/refocus/http.rb

@@ -1,3 +1,5 @@
+require "refocus/errors"
+
 module Refocus
   class Http
 
@@ -10,23 +12,30 @@ module Refocus
     end
 
     def post(path, body:, expects: 201)
-      connection(path).post(body: convert(body), headers: headers, expects: expects)
+      handle { connection(path).post(body: convert(body), headers: headers, expects: expects) }
     end
 
     def get(path)
-      connection(path).get(headers: headers, expects: 200)
+      handle { connection(path).get(headers: headers, expects: 200) }
     end
 
     def patch(path, body:)
-      connection(path).patch(body: convert(body), headers: headers, expects: 200)
+      handle { connection(path).patch(body: convert(body), headers: headers, expects: 200) }
     end
 
     def put(path, body:)
-      connection(path).put(body: convert(body), headers: headers, expects: 201)
+      handle { connection(path).put(body: convert(body), headers: headers, expects: 201) }
     end
 
     def delete(path)
-      connection(path).delete(headers: headers, expects: 200)
+      handle { connection(path).delete(headers: headers, expects: 200) }
+    end
+
+    def handle(&block)
+      yield
+    rescue Excon::Error::BadRequest => e
+      response = JSON.parse(e.response.body)["errors"].first["message"]
+      raise ApiError, JSON.parse(e.response.body)
     end
 
     def headers

data/lib/refocus/version.rb

@@ -1,3 +1,3 @@
 module Refocus
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refocus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Shea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,8 +116,12 @@ files:
 - lib/refocus.rb
 - lib/refocus/aspects.rb
 - lib/refocus/cli.rb
+- lib/refocus/cli/aspects.rb
+- lib/refocus/cli/resources.rb
 - lib/refocus/cli/samples.rb
+- lib/refocus/cli/subjects.rb
 - lib/refocus/client.rb
+- lib/refocus/errors.rb
 - lib/refocus/http.rb
 - lib/refocus/json_helper.rb
 - lib/refocus/path_helper.rb