xapixctl 1.1.2 → 1.2.0

data/lib/xapixctl/phoenix_client/result_handler.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Xapixctl
+  module PhoenixClient
+    class ResultHandler
+      def initialize(default_success_handler:, default_error_handler:)
+        @success_handler = default_success_handler
+        @error_handler = default_error_handler
+        @result_handler = nil
+        yield self if block_given?
+      end
+
+      def on_success(&block); @success_handler = block; self; end
+
+      def on_error(&block); @error_handler = block; self; end
+
+      def prepare_data(proc); @result_handler = proc; self; end
+
+      def formatter(proc); @formatter = proc; self; end
+
+      def run
+        res = yield
+        res = res.present? ? JSON.parse(res) : res
+        res = @result_handler ? @result_handler.call(res) : res
+        res = @formatter ? @formatter.call(res) : res
+        @success_handler.call(res)
+      rescue RestClient::Exception => err
+        response = JSON.parse(err.response) rescue {}
+        @error_handler.call(err, response)
+      rescue SocketError, Errno::ECONNREFUSED => err
+        @error_handler.call(err, nil)
+      end
+    end
+  end
+end

data/lib/xapixctl/preview_cli.rb

@@ -4,8 +4,6 @@ require 'xapixctl/base_cli'
 
 module Xapixctl
   class Preview < BaseCli
-    option :org, aliases: "-o", desc: "Organization", required: true
-    option :project, aliases: "-p", desc: "Project", required: true
     option :format, aliases: "-f", default: 'text', enum: ['text', 'yaml', 'json'], desc: "Output format"
     desc "pipeline ID", "Preview a pipeline"
     long_desc <<-LONGDESC
@@ -17,16 +15,12 @@ module Xapixctl
 
       Examples:
       \x5> $ xapixctl preview pipeline -o xapix -p some-project pipeline
+      \x5> $ xapixctl preview pipeline -p xapix/some-project pipeline
     LONGDESC
     def pipeline(pipeline)
-      connection.pipeline_preview(pipeline, org: options[:org], project: options[:project], format: options[:format].to_sym) do |res|
-        res.on_success { |preview| puts preview }
-        res.on_error { |err, result| warn_api_error('could not fetch preview', err, result) }
-      end
+      puts prj_connection.pipeline_preview(pipeline, format: options[:format].to_sym)
     end
 
-    option :org, aliases: "-o", desc: "Organization", required: true
-    option :project, aliases: "-p", desc: "Project", required: true
     option :format, aliases: "-f", default: 'text', enum: ['text', 'yaml', 'json'], desc: "Output format"
     desc "endpoint ID", "Preview an endpoint"
     long_desc <<-LONGDESC
@@ -36,16 +30,12 @@ module Xapixctl
 
       Examples:
       \x5> $ xapixctl preview endpoint -o xapix -p some-project endpoint
+      \x5> $ xapixctl preview endpoint -p xapix/some-project endpoint
     LONGDESC
     def endpoint(endpoint)
-      connection.endpoint_preview(endpoint, org: options[:org], project: options[:project], format: options[:format].to_sym) do |res|
-        res.on_success { |preview| puts preview }
-        res.on_error { |err, result| warn_api_error('could not fetch preview', err, result) }
-      end
+      puts prj_connection.endpoint_preview(endpoint, format: options[:format].to_sym)
     end
 
-    option :org, aliases: "-o", desc: "Organization", required: true
-    option :project, aliases: "-p", desc: "Project", required: true
     option :format, aliases: "-f", default: 'text', enum: ['text', 'yaml', 'json'], desc: "Output format"
     desc "stream-processor ID", "Preview a stream processor"
     long_desc <<-LONGDESC
@@ -55,12 +45,10 @@ module Xapixctl
 
       Examples:
       \x5> $ xapixctl preview stream-processor -o xapix -p some-project processor
+      \x5> $ xapixctl preview stream-processor -p xapix/some-project processor
     LONGDESC
     def stream_processor(stream_processor)
-      connection.stream_processor_preview(stream_processor, org: options[:org], project: options[:project], format: options[:format].to_sym) do |res|
-        res.on_success { |preview| puts preview }
-        res.on_error { |err, result| warn_api_error('could not fetch preview', err, result) }
-      end
+      puts prj_connection.stream_processor_preview(stream_processor, format: options[:format].to_sym)
     end
   end
 end

data/lib/xapixctl/sync_cli.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'xapixctl/base_cli'
+
+module Xapixctl
+  class Sync < BaseCli
+    option :org, aliases: "-o", desc: "Organization"
+    option :project, aliases: "-p", desc: "Project"
+    desc "to-dir DIRECTORY", "Syncs resources in project to directory"
+    long_desc <<-LONGDESC
+      `xapixctl sync to-dir project dir` will export all resources of a given project and remove any additional resources from the directory.
+
+      Examples:
+      \x5> $ xapixctl sync to-dir xapix/some-project ./project_dir
+    LONGDESC
+    def to_dir(dir)
+      sync_path = Pathname.new(dir)
+
+      res_details = prj_connection.project_resource
+      write_resource_to(res_details, sync_path, 'project')
+      sync_path.join('README.md').write(generate_readme(res_details))
+
+      prj_connection.resource_types_for_export.each do |type|
+        res_path = sync_path.join(type.underscore)
+        new_files = []
+        prj_connection.resource_ids(type).each do |res_id|
+          res_details = prj_connection.resource(type, res_id)
+          new_files << write_resource_to(res_details, res_path, res_id)
+        end
+        (res_path.glob('*.yaml') - new_files).each do |outdated_file|
+          outdated_file.delete
+          puts "removed #{outdated_file}"
+        end
+      end
+    end
+
+    option :org, aliases: "-o", desc: "Organization"
+    option :project, aliases: "-p", desc: "Project"
+    desc "from-dir DIRECTORY", "Syncs resources in project from directory"
+    long_desc <<-LONGDESC
+      `xapixctl sync from-dir project dir` will import all resources into the given project from the directory and remove any additional resources which are not present in the directory.
+
+      Examples:
+      \x5> $ xapixctl sync from-dir xapix/some-project ./project_dir
+    LONGDESC
+    def from_dir(dir)
+      sync_path = Pathname.new(dir)
+
+      resources_from_file(sync_path.join('project.yaml'), ignore_missing: false) do |desc|
+        puts "applying #{desc['kind']} #{desc.dig('metadata', 'id')} to #{prj_connection.project}"
+        desc['metadata']['id'] = prj_connection.project
+        prj_connection.organization.apply(desc)
+      end
+
+      outdated_resources = {}
+      prj_connection.resource_types_for_export.each do |type|
+        res_path = sync_path.join(type.underscore)
+        updated_resource_ids = []
+        resources_from_file(res_path, ignore_missing: true) do |desc|
+          puts "applying #{desc['kind']} #{desc.dig('metadata', 'id')}"
+          updated_resource_ids += prj_connection.apply(desc)
+        end
+        outdated_resources[type] = prj_connection.resource_ids(type) - updated_resource_ids
+      end
+
+      outdated_resources.each do |type, resource_ids|
+        resource_ids.each do |resource_id|
+          puts "removing #{type} #{resource_id}"
+          prj_connection.delete(type, resource_id)
+        end
+      end
+    end
+
+    private
+
+    def write_resource_to(res_details, res_path, res_name)
+      res_path.mkpath
+      unless res_path.directory? && res_path.writable?
+        warn "Cannot write to #{dir}, please check directory exists and is writable"
+        exit 1
+      end
+      res_file = res_path.join("#{res_name}.yaml")
+      res_file.write(res_details.to_yaml)
+      puts "updated #{res_file}..."
+      res_file
+    end
+
+    def generate_readme(res_details)
+      <<~EOREADME
+        # #{res_details.dig('definition', 'name')}
+        #{res_details.dig('definition', 'description')}
+
+        Project exported from #{File.join(prj_connection.public_project_url)} by xapixctl v#{Xapixctl::VERSION}.
+      EOREADME
+    end
+  end
+end

data/lib/xapixctl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xapixctl
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/xapixctl.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "xapixctl/version"
@@ -24,13 +26,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.6'
+
   spec.add_dependency "activesupport", ">= 5.2.3", "< 6.0.0"
   spec.add_dependency "rest-client", ">= 2.1.0", "< 3.0.0"
-  spec.add_dependency "thor", ">= 1.0.0", "< 1.1.0"
+  spec.add_dependency "thor", ">= 1.0.0", "< 1.2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.17.3"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "relaxed-rubocop", "~> 2.5"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.89"
+  spec.add_development_dependency "rubocop", "~> 1.11"
+  spec.add_development_dependency "rubocop-rake"
+  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapixctl
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Reinsch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,7 +59,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,21 +69,21 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - michael@xapix.io
@@ -148,6 +190,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/cd.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -164,7 +207,12 @@ files:
 - lib/xapixctl/base_cli.rb
 - lib/xapixctl/cli.rb
 - lib/xapixctl/phoenix_client.rb
+- lib/xapixctl/phoenix_client/connection.rb
+- lib/xapixctl/phoenix_client/organization_connection.rb
+- lib/xapixctl/phoenix_client/project_connection.rb
+- lib/xapixctl/phoenix_client/result_handler.rb
 - lib/xapixctl/preview_cli.rb
+- lib/xapixctl/sync_cli.rb
 - lib/xapixctl/version.rb
 - xapixctl.gemspec
 homepage: https://github.com/xapix-io/xapixctl
@@ -181,14 +229,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: xapix client library and command line tool