marketplace-kit 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14be8b29844b60d5be3f94fa6619599e0a2ac0bc
-  data.tar.gz: 647598d7ec8a66a5f1d103aada297534c6fa2f11
+  metadata.gz: 8b630bebf9a893b0a57f93311ac7216fc8311f59
+  data.tar.gz: f708c27fa61ce7333c346836ef2c3afac9379a60
 SHA512:
-  metadata.gz: 52ecc290e1efbf67389c2bda3999c2228e681f841fc6eaef60c33d04848a638661b2d10fb1ea28193cbefd15dbaea6fe76a88e443e3bb73c2e4adbce0053fdff
-  data.tar.gz: cf7ca768ea907ac894dabf65a642c0367e6a46aa383d8653ff32056ac89353b61012ab926f04389e3548eb465be49be1fa3b131ede89b6c53d1c1482e681dd99
+  metadata.gz: fe9c3698a774033d0f64e8f8207ff80d300b350ae95296954d3dfaa38964bfdf6f8d488679175de9549319dd152030575e5d76f07e9ac1d04be12eb706eb5ba5
+  data.tar.gz: f5fb46f4e5951dff722b94d5cf78e55f7446427c06441aad4c05b4639076acb39e9030dacdf286531c3c08ed412d248bed57404bc49fc15938ab7c06ce555fb9

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/marketplace-kit-*

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.0
+  - 2.3.4
   - 2.4.1
 env:
 script:

data/CONTRIBUTE_README.md

@@ -0,0 +1,21 @@
+# MarketplaceKit contribute guide
+How to develop, test and release new version of the gem
+
+When setting new version to release, please read [SemVer](http://semver.org/).
+
+## Test
+
+    rake spec
+
+## Test locally
+
+1. Change code
+2. `gem build marketplace_kit.gemspec`
+3. `gem install marketplace-kit-x.x.x.gem`
+4. Run `marketplace-kit`
+
+## Release
+
+1. `gem build marketplace_kit.gemspec`
+2. `gem push marketplace-kit-x.x.x.gem`
+3. Create git tag `git tag vx.x.x; git push origin --tags`

data/README.md

@@ -47,4 +47,8 @@ All commands should be run in the marketplace directory (ie. `marketplace-nearme
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/mdyd-dev/marketplace-kit.
+[Contributing quick start](https://github.com/mdyd-dev/marketplace-kit/blob/master/CONTRIBUTE_README.md)
+
+[Bug reports, feature requests](https://github.com/mdyd-dev/marketplace-kit/issues)
+
+[Pull requests](https://github.com/mdyd-dev/marketplace-kit/pulls)

data/lib/marketplace_kit/commands/deploy.rb

@@ -22,11 +22,21 @@ module MarketplaceKit
 
       def zip_marketplace_builder_directory
         system "rm #{Dir.getwd}/tmp/marketplace_builder.zip"
-        system "cd #{MarketplaceKit::MARKETPLACE_BUILDER_FOLDER}; zip -r #{Dir.getwd}/tmp/marketplace_builder.zip ."
+        force_mode? ? zip_all_files : zip_files_without_old_assets
+      end
+
+      def zip_files_without_old_assets
+        files_path = changed_files.map { |path| path.gsub(%r{^\/}, '') }
+        File.open('tmp/files_to_zip.txt', 'w+') { |file| file.puts files_path }
+        system "cd #{MarketplaceKit::MARKETPLACE_BUILDER_FOLDER}; zip #{root}/tmp/marketplace_builder.zip -@ < #{root}/tmp/files_to_zip.txt"
+      end
+
+      def zip_all_files
+        system "cd #{MarketplaceKit::MARKETPLACE_BUILDER_FOLDER}; zip -r #{root}/tmp/marketplace_builder.zip ."
       end
 
       def send_zip_to_server
-        gateway.deploy("#{Dir.getwd}/tmp/marketplace_builder.zip", force: is_force_mode)
+        gateway.deploy("#{root}/tmp/marketplace_builder.zip", force: force_mode?, manifest: manifest)
       end
 
       def wait_for_deploy(deploy_id)
@@ -54,9 +64,45 @@ module MarketplaceKit
         end
       end
 
-      def is_force_mode
+      def force_mode?
         (@command_args & ['--force', '-f']).any?
       end
+
+      def manifest
+        Dir.glob("marketplace_builder/**/*")
+           .select { |path| File.file?(path) }
+           .map { |path| [path.gsub('marketplace_builder', ''), { 'md5' => Digest::MD5.hexdigest(File.read(path)) }] }
+           .to_h
+      end
+
+      def root
+        Dir.getwd
+      end
+
+      def changed_files
+        ListChangedFiles.new(manifest, gateway.settings.body).call.keys
+      end
+
+      class ListChangedFiles
+        def initialize(manifest, settings)
+          @manifest = manifest
+          @settings = settings
+        end
+
+        def call
+          @manifest.reject do |path, meta|
+            path.start_with?('/custom_themes/') &&
+              manifest_on_server[path] &&
+              manifest_on_server[path]['md5'] == meta['md5']
+          end
+        end
+
+        private
+
+        def manifest_on_server
+          @manifest_on_server ||= @settings['manifest']
+        end
+      end
     end
   end
 end

data/lib/marketplace_kit/services/api_gateway.rb

@@ -2,39 +2,54 @@ module MarketplaceKit
   module Services
     class ApiGateway
       def login(email, password)
-        response = send(:post, 'sessions', email: email, password: password)
+        response = send_request(:post, 'sessions', email: email, password: password)
         raise Errors::MarketplaceError.new('Error: Invalid email or password!') if response.status == 401
 
         response.body['token']
       end
 
       def login_required?
-        response = send(:get, "sessions?temporary_token=#{MarketplaceKit.config.token}")
+        response = send_request(:get, "sessions?temporary_token=#{MarketplaceKit.config.token}")
         raise Errors::MarketplaceError.new('Login failed.') unless response.success?
 
         response.body['login_required']
       end
 
       def send_file_change(file_path, file_content)
-        send(:put, 'marketplace_releases/sync', path: file_path, marketplace_builder_file_body: file_content)
+        send_request(:put, 'marketplace_releases/sync', path: file_path, marketplace_builder_file_body: file_content)
       end
 
       def get_deploy(deploy_id)
-        send(:get, "marketplace_releases/#{deploy_id}")
+        send_request(:get, "marketplace_releases/#{deploy_id}")
       end
 
-      def deploy(zip_file_path, deploy_options)
+      def deploy(zip_file_path, force:, manifest:)
         upload_file = Faraday::UploadIO.new(zip_file_path, 'application/zip')
-        send(:post, 'marketplace_releases', { marketplace_builder: { zip_file: upload_file, force_mode: deploy_options[:force] } }, multipart: true)
+        send_request(
+          :post,
+          'marketplace_releases',
+          {
+            marketplace_builder: {
+              zip_file: upload_file,
+              force_mode: force,
+              manifest: manifest
+            }
+          },
+          multipart: true
+        )
       end
 
       def backup
-        send(:post, 'marketplace_releases/backup', {})
+        send_request(:post, 'marketplace_releases/backup', {})
+      end
+
+      def settings
+        send_request(:get, 'settings')
       end
 
       private
 
-      def send(request_type, url, body = {}, options = {})
+      def send_request(request_type, url, body = {}, options = {})
         ApiDriver.new(request_type, url, body, options).send_request
       end
     end

data/lib/marketplace_kit/version.rb

@@ -1,3 +1,3 @@
 module MarketplaceKit
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/marketplace_builder/custom_themes/default_custom_theme/foo.txt

@@ -0,0 +1 @@
+foo

data/marketplace_builder/custom_themes/default_custom_theme/foo_unchanged.txt

@@ -0,0 +1 @@
+foo unchanged

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marketplace-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Michal Janeczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CONTRIBUTE_README.md
 - Gemfile
 - README.md
 - Rakefile
@@ -213,7 +214,10 @@ files:
 - lib/marketplace_kit/version.rb
 - marketplace_builder/.builder
 - marketplace_builder/.builder-autogenerated
+- marketplace_builder/custom_themes/default_custom_theme/foo.txt
+- marketplace_builder/custom_themes/default_custom_theme/foo_unchanged.txt
 - marketplace_builder/liquid_views/index.liquid
+- marketplace_builder/liquid_views/unchanged_file.liquid
 - marketplace_kit.gemspec
 homepage: https://marketplaceplatform.com
 licenses: []
@@ -235,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Marketplace Kit