marketplace-kit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d097ad89b43f1bca5625489193194ccdbce4d586
-  data.tar.gz: aa42bd855f0195ed154ff7dfecd1ac310be56c9c
+  metadata.gz: 4cf0ff59d61afee0ea9b0805086835383abd268a
+  data.tar.gz: d19b7935d2593fd5bfd6ad6099a99998c704093a
 SHA512:
-  metadata.gz: c3132226f839c6e1341601af8ed828a4a2bced49325ddb6c49ad72a4e953fa2ae7fc9650dedc68cb948dd23e70627a0574e33fafd0d1f32e43a2e1be4057c416
-  data.tar.gz: b1235bb4cf5ee93ec706be06fe77dcb0a575bbf145ecc6cab23345a85d1835639ddd7c04b689434937785504655cb75e3deb16760c22d5f05680854f7837636a
+  metadata.gz: 507de84b9c1ba794a37bef6804e50ea26cf9c0babb3867d9fa0ab46d04d1de5a1848b6dfcfbe11df66c6c618d43d79f9d0e16f0995350fd9ab6c2e75c06f886f
+  data.tar.gz: d8c2d35a7d153a06725b2b23d9b74fa8627587cc9e6043f5c6813987162cbf9512db0285d7230c00213eb9e7839c3a55e1686cdd196fdb7f017b65385ea48c58

data/lib/marketplace_kit.rb

@@ -17,9 +17,12 @@ require 'marketplace_kit/services/config'
 require 'marketplace_kit/services/api_driver'
 require 'marketplace_kit/services/api_gateway'
 require 'marketplace_kit/commands/base_command'
+require 'marketplace_kit/commands/base_authorized_command'
 require 'marketplace_kit/commands/sync'
 require 'marketplace_kit/commands/deploy'
 require 'marketplace_kit/commands/pull'
+require 'marketplace_kit/commands/show_version'
+require 'marketplace_kit/commands/show_help'
 
 module MarketplaceKit
   MARKETPLACE_BUILDER_FOLDER = 'marketplace_builder'.freeze

data/lib/marketplace_kit/command_dispatcher.rb

@@ -1,16 +1,13 @@
 module MarketplaceKit
   class CommandDispatcher
     extend Forwardable
-    def_delegators :args_parser, :command_name, :command_args, :current_env
+    def_delegators :args_parser, :command_name, :command_args
 
     def initialize(args)
       @args = args
     end
 
     def execute
-      MarketplaceKit.config.load current_env
-      user_authentication.authenticate
-
       command.new(command_args).execute
     rescue Errors::MarketplaceError => e
       puts e.message.red
@@ -23,16 +20,14 @@ module MarketplaceKit
                    when 'sync'   then Commands::Sync
                    when 'deploy' then Commands::Deploy
                    when 'pull'   then Commands::Pull
-                   else raise Errors::MarketplaceError.new('Usage: marketplace-kit sync | deploy | pull')
-      end
+                   when '--version', '-v' then Commands::ShowVersion
+                   when '--help', '-h' then Commands::ShowHelp
+                   else Commands::ShowHelp
+                   end
     end
 
     def args_parser
       @args_parse ||= Services::ArgsParser.new @args
     end
-
-    def user_authentication
-      @user_authentication ||= Services::UserAuthentication.new
-    end
   end
 end

data/lib/marketplace_kit/commands/base_authorized_command.rb

@@ -0,0 +1,41 @@
+module MarketplaceKit
+  module Commands
+    class BaseAuthorizedCommand < BaseCommand
+      def initialize(command_args)
+        @command_args = command_args
+        authenticate
+      end
+
+      protected
+
+      def ensure_tmp_folder_exist
+        Dir.mkdir('tmp') unless File.exist?('tmp')
+      end
+
+      def gateway
+        @gateway ||= Services::ApiGateway.new
+      end
+
+      def authenticate
+        MarketplaceKit.config.load current_env
+        user_authentication.authenticate
+      end
+
+      def current_env
+        endpoint_arg_value
+      end
+
+      def endpoint_arg_index
+        @endpoint_arg_index ||= @command_args.find_index { |arg| arg == '-e' }
+      end
+
+      def endpoint_arg_value
+        endpoint_arg_index && @command_args[endpoint_arg_index + 1]
+      end
+
+      def user_authentication
+        @user_authentication ||= Services::UserAuthentication.new
+      end
+    end
+  end
+end

data/lib/marketplace_kit/commands/base_command.rb

@@ -1,19 +1,11 @@
 module MarketplaceKit
   module Commands
     class BaseCommand
+      include Services::Loggable
+
       def initialize(command_args)
         @command_args = command_args
       end
-
-      protected
-
-      def ensure_tmp_folder_exist
-        Dir.mkdir('tmp') unless File.exist?('tmp')
-      end
-
-      def gateway
-        @gateway ||= Services::ApiGateway.new
-      end
     end
   end
 end

data/lib/marketplace_kit/commands/deploy.rb

@@ -1,8 +1,6 @@
 module MarketplaceKit
   module Commands
-    class Deploy < BaseCommand
-      include Services::Loggable
-
+    class Deploy < BaseAuthorizedCommand
       def execute
         log :deploy_started
         ensure_tmp_folder_exist
@@ -57,7 +55,7 @@ module MarketplaceKit
       def handle_deploy_result(deploy_response)
         print "\n"
         if deploy_response.body['status'] == 'success'
-          puts 'success'.green
+          log :deploy_succeeded
         else
           parsed_error = JSON.parse(deploy_response.body['error'])
           log :api_error, parsed_error['message'], parsed_error['details']

data/lib/marketplace_kit/commands/pull.rb

@@ -1,8 +1,6 @@
 module MarketplaceKit
   module Commands
-    class Pull < BaseCommand
-      include Services::Loggable
-
+    class Pull < BaseAuthorizedCommand
       def execute
         log :pull_started
         ensure_tmp_folder_exist
@@ -48,7 +46,7 @@ module MarketplaceKit
       def handle_deploy_result(deploy_response)
         print "\n"
         if deploy_response.body['status'] == 'success'
-          puts 'success'.green
+          log :pull_succeeded
           deploy_response
         else
           parsed_error = JSON.parse(deploy_response.body['error'])

data/lib/marketplace_kit/commands/show_help.rb

@@ -0,0 +1,12 @@
+module MarketplaceKit
+  module Commands
+    class ShowHelp < BaseCommand
+      include Services::Loggable
+
+      def execute
+        ShowVersion.new(nil).execute
+        log :usage
+      end
+    end
+  end
+end

data/lib/marketplace_kit/commands/show_version.rb

@@ -0,0 +1,11 @@
+module MarketplaceKit
+  module Commands
+    class ShowVersion < BaseCommand
+      include Services::Loggable
+
+      def execute
+        log :version, MarketplaceKit::VERSION
+      end
+    end
+  end
+end

data/lib/marketplace_kit/commands/sync.rb

@@ -1,8 +1,6 @@
 module MarketplaceKit
   module Commands
-    class Sync < BaseCommand
-      include Services::Loggable
-
+    class Sync < BaseAuthorizedCommand
       def execute
         log :sync_command_started
 
@@ -23,8 +21,6 @@ module MarketplaceKit
       def on_file_change(file_path)
         log :sync_updating, file_path
         response = gateway.send_file_change relative_file_path(file_path), File.read(file_path)
-
-        log :sync_done if response.success?
       end
 
       def relative_file_path(file_path)

data/lib/marketplace_kit/services/api_driver.rb

@@ -72,7 +72,9 @@ module MarketplaceKit
             'UserTemporaryToken' => MarketplaceKit.config.token,
             'Accept' => 'application/vnd.nearme.v4+json'
           }
-        }
+        }.tap do |config|
+          config[:ssl] = { verify: false } unless MarketplaceKit.config.endpoint == 'production'
+        end
       end
 
       def fix_font_file_encoding

data/lib/marketplace_kit/services/args_parser.rb

@@ -1,8 +1,6 @@
 module MarketplaceKit
   module Services
     class ArgsParser
-      DEFAULT_ENV = 'localhost'
-
       def initialize(args)
         @args = args
       end
@@ -14,21 +12,6 @@ module MarketplaceKit
       def command_args
         @args[1..-1] || []
       end
-
-      def current_env
-        return DEFAULT_ENV unless e_arg_index
-        env_arg_value || DEFAULT_ENV
-      end
-
-      private
-
-      def e_arg_index
-        @e_arg_index ||= command_args.find_index { |arg| arg == '-e' }
-      end
-
-      def env_arg_value
-        command_args[e_arg_index + 1]
-      end
     end
   end
 end

data/lib/marketplace_kit/services/config.rb

@@ -1,13 +1,17 @@
 module MarketplaceKit
   module Services
     class Config
+      def endpoint
+        @endpoint
+      end
+
       def load(endpoint_name)
         @config = {}
-        @endpoint = endpoint_name
 
         load_config_from '.builder'
         load_config_from '.builder-autogenerated', required: false
 
+        @endpoint = endpoint_name || default_endpoint
         raise Errors::MarketplaceError.new 'Error: Invalid env passed!' if @config[@endpoint].nil?
       rescue Errno::ENOENT
         raise Errors::MarketplaceError.new 'Please create .builder file in order to continue.'
@@ -26,6 +30,10 @@ module MarketplaceKit
         @config[@endpoint]['url'].to_s
       end
 
+      def default_endpoint
+        @config.select { |_k, config| config['default']}.keys.first || 'localhost'.freeze
+      end
+
       private
 
       def load_config_from(file_name, options = {})
@@ -40,12 +48,12 @@ module MarketplaceKit
         File.write("#{MarketplaceKit.builder_folder}.builder-autogenerated", config.to_json)
       end
 
-        def autogenerated_config
-          return {} unless File.exist?("#{MarketplaceKit.builder_folder}.builder-autogenerated")
+      def autogenerated_config
+        return {} unless File.exist?("#{MarketplaceKit.builder_folder}.builder-autogenerated")
 
-          raw_config = File.read("#{MarketplaceKit.builder_folder}.builder-autogenerated")
-          JSON.parse raw_config
-        end
+        raw_config = File.read("#{MarketplaceKit.builder_folder}.builder-autogenerated")
+        JSON.parse raw_config
+      end
     end
   end
 end

data/lib/marketplace_kit/services/logger.rb

@@ -2,7 +2,7 @@ module MarketplaceKit
   module Services
     class Logger
       def deploy_started
-        puts 'Deploy command started!'.green
+        puts 'Deploy command started'.green
       end
 
       def compressing_folder
@@ -10,15 +10,19 @@ module MarketplaceKit
       end
 
       def sending_zip
-        puts 'Sending zip to the server'.yellow
+        puts 'Sending zip file to the server'.yellow
       end
 
       def wait_for_deploy_finish
         puts 'Waiting for deploy to finish'.yellow
       end
 
+      def deploy_succeeded
+        puts 'Deploy command succeded'.green
+      end
+
       def pull_started
-        puts 'Pull command started!'.green
+        puts 'Pull command started'.green
       end
 
       def request_backup
@@ -29,6 +33,10 @@ module MarketplaceKit
         puts 'Waiting for backup to finish'.yellow
       end
 
+      def pull_succeeded
+        puts 'Pull command succeded'.green
+      end
+
       def sync_command_started
         puts 'Sync mode enabled'.green
       end
@@ -37,22 +45,29 @@ module MarketplaceKit
         puts "Updating: #{file_path}".green
       end
 
-      def sync_done
-        puts 'Done!'.green
-      end
-
       def ask_for_email
-        puts 'Enter your email'
+        puts 'Enter your email:'.yellow
       end
 
       def ask_for_password
-        puts 'Enter your password'
+        puts 'Enter your password:'.yellow
       end
 
       def redirect_tip
         puts 'Server returned redirect code (possible a wrong domain in config file?)'.yellow
       end
 
+      def version(version)
+        puts "marketplace-kit #{version}"
+      end
+
+      def usage
+        puts ''
+        puts 'Usage: marketplace-kit sync | deploy | pull'
+        puts '  -e endpoint     endpoint from your config file'
+        puts '  -v              show current version'
+      end
+
       def json_error(source)
         puts '```'.red
         puts 'Error while parsing JSON'.red

data/lib/marketplace_kit/version.rb

@@ -1,3 +1,3 @@
 module MarketplaceKit
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/marketplace_builder/.builder

@@ -1,6 +1,7 @@
 {
   "localhost": {
-    "url": "http://localhost:3000"
+    "url": "http://localhost:3000",
+    "default": true
   },
   "staging": {
     "url": "http://staging-url.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marketplace-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michal Janeczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,9 +198,12 @@ files:
 - bin/setup
 - lib/marketplace_kit.rb
 - lib/marketplace_kit/command_dispatcher.rb
+- lib/marketplace_kit/commands/base_authorized_command.rb
 - lib/marketplace_kit/commands/base_command.rb
 - lib/marketplace_kit/commands/deploy.rb
 - lib/marketplace_kit/commands/pull.rb
+- lib/marketplace_kit/commands/show_help.rb
+- lib/marketplace_kit/commands/show_version.rb
 - lib/marketplace_kit/commands/sync.rb
 - lib/marketplace_kit/errors/api_error.rb
 - lib/marketplace_kit/errors/marketplace_error.rb