hu 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8d4e0d3178c2a45526d2483041fa781115a450
-  data.tar.gz: a8ca6f62f38b06a8c47881bb51b19b9a725e6628
+  metadata.gz: 135742548802f1cf65c42791d2c27839da18c4d6
+  data.tar.gz: 5873b031208439a1f552d4a1bdedf8864d592b96
 SHA512:
-  metadata.gz: 4c3c895b4145911370891b7f7e9274d1226b0ce4439b1080cd9b572a43f91097b0fcbe99a1c45a1669236df903aaab99947e354fba9a4c5fa2e04aa7976f60b7
-  data.tar.gz: 184285ed9316e0206f25c4d35bec3992a7c528011f3f3988de123e41625e67179be3b91ec4c2cbcfe28fc318de2b1b5a9e5a74cb531254cc9cd99cd738c1d658
+  metadata.gz: 362abd3e5beed4cb0ffbfb96610be2663c2afe689ff858417375cf6f06d15e436902a4156faf994820093f16be30cb959d0cbfe39ef4d523c4c8edeba7e0d136
+  data.tar.gz: e2b6081abd344ee8f36a2b06bd1095d1594dfb7b675631bdc9ecc78c58849b0e9b41774433fc0897f9b48e56fdcd6dec22aca28ed014b35ae81dd94edfc04b95

data/hu.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "optix"
   spec.add_dependency "platform-api"
   spec.add_dependency "powerbar"
+  spec.add_dependency "hashdiff"
 end

data/lib/hu/cli.rb

@@ -4,15 +4,18 @@ require 'powerbar'
 require 'yaml'
 require 'platform-api'
 
+require 'hu/collab'
+
 module Hu
   class Cli < Optix::Cli
     API_TOKEN = ENV['HEROKU_API_TOKEN']
-    cli_root do
+    Optix::command do
       text "Hu v#{Hu::VERSION} - Heroku Utility"
       if API_TOKEN.nil?
         text ""
         text "\e[1mWARNING: Environment variable 'HEROKU_API_TOKEN' must be set.\e[0m"
       end
+      opt :quiet, "Don't show progress bar", :default => false
       opt :version, "Print version and exit", :short => :none
       trigger :version do
         puts "Hu v#{Hu::VERSION}"
@@ -23,37 +26,11 @@ module Hu
           exit 1
         end
       end
-    end
-
-    desc "Export current collaborator mapping"
-    opt :format, "yaml|json", :default => 'yaml'
-    parent "collab", "Application collaborators"
-    def export(cmd, opts, argv)
-      #raise Optix::HelpNeeded unless opts.values_at(:capslock, :numlock, :verbose).any?
-      data = {}
-      pb = PowerBar.new
-      app_names = h.app.list.map{|e| e['name']}
-      app_names.each_with_index do |app_name,i|
-        pb.show :msg => app_name, :total => app_names.length, :done => i
-        data[app_name] = { 'collaborators' => [] }
-          h.collaborator.list(app_name).map{|e|
-            case e['role']
-            when 'owner'
-              data[app_name]['owner'] = e['user']['email']
-            when nil
-              data[app_name]['collaborators'] << e['user']['email']
-            else
-              raise RuntimeError, "Unknown collaborator role: #{e['role']}"
-            end
-          }
+      filter do |cmd, opts, argv|
+        $quiet = opts[:quiet]
+        $quiet = true unless STDOUT.isatty
       end
-      pb.wipe
-      puts data.send("to_#{opts[:format]}".to_sym)
     end
-
-    def h
-      @h ||= PlatformAPI.connect_oauth(API_TOKEN)
-    end
-
   end
 end
+

data/lib/hu/collab.rb

@@ -0,0 +1,123 @@
+require 'powerbar'
+require 'yaml'
+require 'hashdiff'
+require 'platform-api'
+
+module Hu
+  class Cli < Optix::Cli
+    class Collab < Optix::Cli
+
+      desc "Print current mapping to stdout"
+      opt :format, "yaml|json", :default => 'yaml'
+      parent "collab", "Application collaborators"
+      def export(cmd, opts, argv)
+        puts heroku_state.send("to_#{opts[:format]}".to_sym)
+      end
+
+      OP_COLORS = {
+        '+' => "\e[0;1;32m",
+        '-' => "\e[0;1;31m",
+        '~' => "\e[0;32m",
+      }
+      desc "Read mapping from stdin and diff to heroku state"
+      parent "collab"
+      def diff(cmd, opts, argv)
+        parsed_state = parse_as_json_or_yaml(STDIN.read)
+        plan(HashDiff.diff(heroku_state, parsed_state)).each do |s|
+          color = OP_COLORS[s[:op]]
+          msg = ''
+          if s[:method].nil?
+            color = "\e[0;41;33;1m"
+            msg = "Can not resolve this."
+          end
+          printf "%s%6s %-30s %-15s %-30s %s\e[0m\n", color, s[:op_name], s[:app_name], s[:role], s[:value], msg
+        end
+      end
+
+      OP_MAP = {
+        '+' => 'add',
+        '-' => 'remove',
+        '~' => 'change',
+      }
+      def plan(diff)
+        plan = []
+        diff.each do |op, target, value|
+          app_name, role = target.split('.')
+          role = role.split('[')[0]
+          op_name = OP_MAP[op]
+          method_name = "op_#{op_name}_#{role}".to_sym
+          plan << {
+            app_name: app_name,
+            op: op,
+            op_name: op_name,
+            method: self.respond_to?(method_name) ? method_name : nil,
+            value: value,
+            role: role,
+          }
+        end
+        plan
+      end
+
+      def op_add_collaborators(name)
+        raise NotImplementedError
+      end
+
+      def op_remove_collaborators(name)
+        raise NotImplementedError
+      end
+
+      def parse_as_json_or_yaml(input)
+        begin
+          parsed = JSON.load(input)
+        rescue => jex
+          begin
+            parsed = YAML.load(input)
+            if parsed.is_a? String
+              raise ArgumentError, "Input parsed as YAML yields a String"
+            end
+          rescue => yex
+            STDERR.puts "Error: Could neither parse stdin as YAML nor as JSON."
+            STDERR.puts "-- JSON Error --"
+            STDERR.puts jex
+            STDERR.puts "-- YAML Error --"
+            STDERR.puts yex
+            raise ArgumentError
+          end
+        end
+        parsed
+      end
+
+      def heroku_state
+        data = {}
+        app_names = h.app.list.map{|e| e['name']}
+        app_names.each_with_index do |app_name,i|
+          pb :msg => app_name, :total => app_names.length, :done => i+1
+          data[app_name] = { 'collaborators' => [] }
+            h.collaborator.list(app_name).map{|e|
+              case e['role']
+              when 'owner'
+                data[app_name]['owner'] = e['user']['email']
+              when nil
+                data[app_name]['collaborators'] << e['user']['email']
+              else
+                raise RuntimeError, "Unknown collaborator role: #{e['role']}"
+              end
+            }
+        end
+        pb :wipe
+        data
+      end
+
+      def h
+        @h ||= PlatformAPI.connect_oauth(Hu::Cli::API_TOKEN)
+      end
+
+      def pb(show_opts)
+        return if $quiet
+        @pb ||= PowerBar.new
+        show_opts == :wipe ? @pb.wipe : @pb.show(show_opts)
+      end
+
+    end
+  end
+end

data/lib/hu/version.rb

@@ -1,3 +1,3 @@
 module Hu
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - moe
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Heroku Utility.
 email:
 - moe@busyloop.net
@@ -96,6 +110,7 @@ files:
 - bin/hu
 - hu.gemspec
 - lib/hu/cli.rb
+- lib/hu/collab.rb
 - lib/hu/version.rb
 homepage: https://github.com/busyloop/hu
 licenses: