shopify-cli 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4994302e6b4675d919d6eba3f29037f6531e9d763332e688f6a4e2008a9f8785
-  data.tar.gz: de8db4ec0be15baac70f091548861364919543c193e0c73ecf94e43ac645b9fa
+  metadata.gz: 9c41d92242b50f6d361cd7ad137799bffe507581437f25a1eb1bd183cc206c63
+  data.tar.gz: '06887cc6c8442a754bf9a9d60e10968c5c59325b98a50d452e6f849a80db7226'
 SHA512:
-  metadata.gz: ba5c507a109d2511dc33382152f46aebbfa0ffb80d8e1f34e588730ecbead56ccc476df04d9e902120c1beecd3e69a957415e73c30b11ade137a9572f94fba73
-  data.tar.gz: d4dcd572be32221413d30ebb28acb1a66bf8f8290a6825159c92802e149f48a93cde4dea6d5eb13a0a82e52af34c5a02403328b0e98566f0ef83078875fca942
+  metadata.gz: 23260cf14a8e617539fedb1bddf1beb5f91604fc5db87d147335649dd01f7fb9859c87da6a01bba5c19743dabc8aa0c1c55bf269cdaec57943f076a88fffcff9
+  data.tar.gz: eddd93f62bb2bd7f8364c4c423847568838d08fdbf77f777f03f2adb9fbfa67f7a3af83bedc48025f217e1787288f5b6e10424e5dbdad1156a8faaf80ddb041c

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+Version 0.9.1
+------
+* Updated required Ruby version for the CLI
+* Minor fixes for the build / release process
+
+Version 0.9.0
+------
+* Initial test release of gem-based CLI

data/RELEASING.md

@@ -0,0 +1,51 @@
+## Releasing Shopify CLI
+
+1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
+
+2. Create a branch named `release_X_Y_Z` (replacing `X_Y_Z` with the intended release version)
+   ```
+   $ git checkout -b release_X_Y_Z
+   ```
+
+3. Update the version of Shopify CLI in `lib/shopify-cli/version.rb`
+
+4. Add an entry for the new release to `CHANGELOG.md`
+
+5. Commit the changes with a commit message like "Packaging for release X.Y.Z"
+   ```
+   $ git commit -am "Packaging for release X.Y.Z"
+   ```
+
+6. Push out the changes
+   ```
+   $ git push -u origin release_X_Y_Z
+   ```
+
+7. Open a PR for the branch, get necessary approvals from code owners and merge into main branch
+
+8. Deploy using Shipit
+
+9. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
+   ```
+   $ rake package
+   ```
+   This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
+
+10. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
+    * create a branch named `release_X_Y_Z_of_shopify-cli`
+    * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-app-cli` repo (from step 9)
+    * commit the change and create a PR
+    * when PR is approved, merge into main branch of `Shopify/homebrew-shopify` repository
+
+11. Go to [releases](https://github.com/Shopify/shopify-app-cli/releases) page of `Shopify/shopify-app-cli` repo and create a new release:
+    * use the tag created in step 8 by Shipit (should be "vX.Y.Z")
+    * release title = "Version X.Y.Z"
+    * description should be 
+      ```
+      Release of version X.Y.Z of Shopify App CLI
+    
+      Please refer to [CHANGELOG](https://github.com/Shopify/shopify-app-cli/blob/master/CHANGELOG.md) for details.
+      ```
+    * upload the `.deb` and `.rpm` files from `packaging/builds/X.Y.Z/` (generated in step 9)
+    * if it's a pre-release version, select the "This is a pre-release" checkbox
+    * and click "Publish release".

data/Rakefile

@@ -76,11 +76,6 @@ namespace :package do
 
   task all: [:debian, :rpm, :homebrew]
 
-  desc("Builds a gem of the CLI")
-  task :gem do
-    ShopifyCli::Packager.new.build_gem
-  end
-
   desc("Builds a Debian package of the CLI")
   task :debian do
     ShopifyCli::Packager.new.build_debian
@@ -92,7 +87,7 @@ namespace :package do
   end
 
   desc("Builds a Homebrew package of the CLI")
-  task :homebrew => :"package:gem" do
+  task :homebrew do
     ShopifyCli::Packager.new.build_homebrew
   end
 end

data/lib/shopify-cli/packager.rb

@@ -7,22 +7,8 @@ module ShopifyCli
       FileUtils.mkdir_p(BUILDS_DIR)
     end
 
-    def build_gem
-      build_path = gem_path
-      puts "\nBuilding gem"
-
-      puts "Outputting gem to:\n  #{build_path}\n\n"
-      raise "Failed to build gem" unless system(
-        'gem',
-        'build',
-        '-o',
-        build_path,
-        File.join(ShopifyCli::ROOT, 'shopify-cli.gemspec')
-      )
-    end
-
     def build_debian
-      ensure_program_installed('dpkg-deb')
+      ensure_program_installed('dpkg-deb', 'brew install dpkg')
 
       root_dir = File.join(PACKAGING_DIR, 'debian')
       debian_dir = File.join(root_dir, 'shopify-cli', 'DEBIAN')
@@ -54,7 +40,7 @@ module ShopifyCli
     end
 
     def build_rpm
-      ensure_program_installed('rpmbuild')
+      ensure_program_installed('rpmbuild', 'brew install rpm')
 
       root_dir = File.join(PACKAGING_DIR, 'rpm')
       rpm_build_dir = File.join(root_dir, 'build')
@@ -92,10 +78,14 @@ module ShopifyCli
       spec_contents = File.read(File.join(root_dir, 'shopify-cli.base.rb'))
       spec_contents = spec_contents.gsub('SHOPIFY_CLI_VERSION', ShopifyCli::VERSION)
 
-      checksum = %x`shasum -a 256 #{gem_path}`
-      gem_checksum = checksum.split(' ')[0]
+      puts "Grabbing sha256 checksum from Rubygems.org"
+      require 'digest/sha2'
+      require 'open-uri'
+      gem_checksum = open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCli::VERSION}.gem") do |io|
+        Digest::SHA256.new.hexdigest(io.read)
+      end
 
-      puts "Got sha256 sum for gem: #{gem_checksum}"
+      puts "Got sha256 checksum for gem: #{gem_checksum}"
       spec_contents = spec_contents.gsub('SHOPIFY_CLI_GEM_CHECKSUM', gem_checksum)
 
       puts "Writing generated formula\n  To: #{build_path}\n\n"
@@ -104,13 +94,15 @@ module ShopifyCli
 
     private
 
-    def ensure_program_installed(program)
-      raise "Could not find program #{program} which is required to build the package" unless
-        system(program, '--version', out: File::NULL, err: File::NULL)
-    end
+    def ensure_program_installed(program, installation_cmd)
+      unless system(program, '--version', out: File::NULL, err: File::NULL)
+        raise <<~MESSAGE
+
+          Could not find program #{program} which is required to build the package.
+          You can install it by running `#{installation_cmd}`.
 
-    def gem_path
-      File.join(BUILDS_DIR, "shopify-cli.gem")
+        MESSAGE
+      end
     end
   end
 end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/shopify-cli.gemspec

@@ -4,9 +4,8 @@ Gem::Specification.new do |spec|
   spec.name = "shopify-cli"
   spec.version = ShopifyCli::VERSION
   spec.authors = ["Shopify"]
-  # need to change the email that ends with `shopify.com`
-  spec.email = ["developers@jadedpixel.com"]
-  spec.license = 'Nonstandard'
+  spec.email = ["dev-tools-education@shopify.com"]
+  spec.license = 'MIT'
 
   spec.summary = "Shopify CLI helps you build Shopify apps faster."
   spec.description = <<~HERE
@@ -16,7 +15,7 @@ Gem::Specification.new do |spec|
     and webhooks.
   HERE
   spec.homepage = "https://shopify.github.io/shopify-app-cli/"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -30,7 +29,6 @@ Gem::Specification.new do |spec|
     %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features|packaging)/}) }
   end
   spec.bindir = "bin"
-  # spec.executables = spec.files.grep(%r{^bin/}) { |f| f.sub('bin/', '') }
   spec.require_paths = ["lib", "vendor"]
   spec.extensions = ["ext/shopify-cli/extconf.rb"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,7 @@ description: |
   development process and lets you quickly add popular features, such as billing
   and webhooks.
 email:
-- developers@jadedpixel.com
+- dev-tools-education@shopify.com
 executables: []
 extensions:
 - ext/shopify-cli/extconf.rb
@@ -83,10 +83,12 @@ files:
 - ".tmp/.gitkeep"
 - ".tmp/sv/.gitkeep"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.md
+- LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
 - SECURITY.md
 - Vagrantfile
@@ -345,7 +347,7 @@ files:
 - vendor/lib/semantic/version.rb
 homepage: https://shopify.github.io/shopify-app-cli/
 licenses:
-- Nonstandard
+- MIT
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://shopify.github.io/shopify-app-cli/
@@ -360,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="