bootic_cli 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5127d49dc387636714e2b3a9cbc724d3c240fc8
-  data.tar.gz: 7bd10ce8519aa573ecd6aa0af7dffc900e3b7970
+  metadata.gz: 124176a77bce62cae1afe8e3c7804df89e862462
+  data.tar.gz: 82ab73189ede38c158b8359bd31e54d410837ea3
 SHA512:
-  metadata.gz: 3faff67e89ed9592bf5b7255addbe884154cb21eb4cd9856ef461cd9c9b966b5bc9b5ab15635006f3a0346ab04041aef008d514996452e0f9c42178012840c7a
-  data.tar.gz: 1b205ad3dd475ff19d16e1d65b36b89d86bdc5493ede8efc5e9a56abca64fb9416750e6de9cd89e797659ecaf6d3fab4d0e80b8a8fa2d9bd50b73ecd569f622d
+  metadata.gz: 07cbc4c6fb1d172f4b716be085e5074cca7a1f92da1d7fb0cd1d9292af5e554feba61bad3199508f4ab53f127abdec97f2e6ed34b5f57596614c26dcec4857a4
+  data.tar.gz: 73c3a3dd9c2e07170feb84b10bd25bb1a62d52e08d9bbd18b2c20c60a5bee6eef0e0405fc0728da08432c8ed2e6ed2226d1253d10258298a816fa1627875c0e1

data/README.md

@@ -98,12 +98,6 @@ bootic help list_products
 bootic list_products list -s hidden
 ```
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec bootic` to use the code located in this directory, ignoring other installed copies of this gem.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 1. Fork it ( https://github.com/bootic/bootic_cli/fork )

data/bootic_cli.gemspec

@@ -6,8 +6,8 @@ require 'bootic_cli/version'
 Gem::Specification.new do |spec|
   spec.name          = "bootic_cli"
   spec.version       = BooticCli::VERSION
-  spec.authors       = ["Ismael Celis"]
-  spec.email         = ["ismael@bootic.io"]
+  spec.authors       = ["Ismael Celis", "Tomás Pollak"]
+  spec.email         = ["ismael@bootic.io", "tomas@bootic.io"]
 
   spec.summary       = %q{Bootic command-line client.}
   spec.description   = %q{Bootic command-line client.}

data/lib/bootic_cli/commands/themes.rb

@@ -31,6 +31,22 @@ module BooticCli
         end
       end
 
+      desc 'dev', 'Create a development theme for your current shop'
+      def dev
+        within_theme do
+          local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir)
+          unless remote_theme.public?
+            prompt.say "You already have a development theme set up!", :red
+            abort
+          end
+
+          local_theme = theme_selector.create_dev_theme(current_dir)
+          prompt.say "Success! You're now working on a development copy of your theme."
+          prompt.say "Any changes you push or sync won't appear on your public website, but on the development version."
+          prompt.say "Once you're ready to merge your changes back, run the `publish` command."
+        end
+      end
+
       desc 'pull', 'Pull remote changes into current theme directory'
       option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Pull from public theme, even if dev theme exists'
       option :delete, banner: '<true|false>', type: :boolean, desc: 'Remove local files that were removed in remote theme (default: true)'
@@ -54,7 +70,7 @@ module BooticCli
         end
       end
 
-      desc 'sync', 'Sync changes from local theme copy with remote'
+      desc 'sync', 'Sync changes between local and remote themes'
       option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Sync to public theme, even if dev theme exists'
       def sync
         within_theme do
@@ -65,12 +81,17 @@ module BooticCli
         end
       end
 
-      desc 'compare', 'Show differences between local and remote copies'
-      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Compare against public theme, even if dev theme exists'
+      desc 'compare', 'Show differences between local and remote copies (both public and dev, if present)'
       def compare
         within_theme do
-          local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
+          local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir)
           workflows.compare(local_theme, remote_theme)
+
+          # if we just compared against the dev theme, redo the mumbo-jumbo but with the public one
+          unless remote_theme.public?
+            local_theme, public_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, true)
+            workflows.compare(local_theme, public_theme)
+          end
         end
       end
 
@@ -99,7 +120,8 @@ module BooticCli
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir)
 
           if remote_theme.public?
-            prompt.say "You don't seem to have a development theme set up, so there's nothing to publish!", :red
+            prompt.say "You don't seem to have a development theme set up, so there's nothing to publish. :)", :red
+            prompt.say "To push your local changes directly to your public theme, either run the `push` or `sync` commands.", :red
           else
 
             # check if there are any differences between the dev and public themes

data/lib/bootic_cli/themes/api_theme.rb

@@ -70,9 +70,9 @@ module BooticCli
         theme.can?(:publish_theme)
       end
 
-      def publish
+      def publish(opts = {})
         if theme.can?(:publish_theme)
-          @theme = theme.publish_theme
+          @theme = theme.publish_theme(opts)
           reload!(false)
         end
       end

data/lib/bootic_cli/themes/theme_selector.rb

@@ -49,6 +49,14 @@ module BooticCli
         theme
       end
 
+      def create_dev_theme(dir)
+        theme = select_local_theme(dir)
+        shop = find_remote_shop(theme.subdomain)
+        raise "No shop with subdomain #{subdomain}" unless shop
+        raise 'Dev theme not available!' unless shop.themes.can?(:create_dev_theme)
+        new_theme = APITheme.new(shop.themes.create_dev_theme)
+      end
+
       def select_local_theme(dir, subdomain = nil)
         FSTheme.new(File.expand_path(dir), subdomain: subdomain)
       end

data/lib/bootic_cli/themes/workflows.rb

@@ -162,6 +162,27 @@ module BooticCli
         end
       end
 
+      def publish(local_theme, remote_theme)
+        raise "This command is meant for dev themes only" unless remote_theme.dev?
+
+        changes = ThemeDiff.new(source: local_theme, target: remote_theme)
+        if changes.any?
+          prompt.say "There are differences between your local and the remote version of your shop's development theme."
+          if prompt.yes_or_no? "Push your local changes now?", true
+            push(local_theme, remote_theme, delete: true)
+          else
+            prompt.say "No problem. Please make sure both versions are synced before publishing.", :magenta
+            exit(1)
+          end
+        end
+
+        delete_dev = prompt.yes_or_no? "Delete the development copy of your theme after publishing?", true
+        prompt.notice "Alrighty! Publishing your development theme..."
+        updated_theme = remote_theme.publish(delete: delete_dev)
+
+        prompt.notice "Yay! Your development theme has been made public. Take a look at #{remote_theme.path.sub('/preview/dev', '')}"
+      end
+
       def watch(dir, remote_theme, watcher: Listen)
         listener = watcher.to(dir) do |modified, added, removed|
           if modified.any?
@@ -200,25 +221,6 @@ module BooticCli
         Kernel.sleep
       end
 
-      def publish(local_theme, remote_theme)
-        raise "This command is meant for dev themes only" unless remote_theme.dev?
-
-        changes = ThemeDiff.new(source: local_theme, target: remote_theme)
-        if changes.any?
-          prompt.say "There are some differences between your local and the remote version of your development theme."
-          if prompt.yes_or_no? "Do you want to push your local changes now?", false
-            push(local_theme, remote_theme, delete: true)
-          else
-            prompt.say "Oh well. Please make sure both versions are synced before publishing.", :magenta
-            exit(1)
-          end
-        end
-
-        prompt.notice "Alrighty! Publishing your development theme..."
-        updated_theme = remote_theme.publish # syncs dev to public, without flipping them
-        prompt.notice "Yay! Your development theme has been made public. Take a look at #{remote_theme.path.sub('/preview/dev', '')}"
-      end
-
       private
       attr_reader :prompt
 

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ismael Celis
+- Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -139,6 +140,7 @@ dependencies:
 description: Bootic command-line client.
 email:
 - ismael@bootic.io
+- tomas@bootic.io
 executables:
 - bootic
 extensions: []