bootic_cli 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6d8b35e5dbac7b46fc56dc3e05386fd08234fdca802a1a677d5245f5eb54028e
-  data.tar.gz: '05488c11d71bfe841474f0ff88e7c1ca018069e3e5b3d71d4dd0a7ac789fa970'
+SHA1:
+  metadata.gz: 346b8d30dccaeeb709f98d6a1666150e7f0f07d5
+  data.tar.gz: 106a59cc10fde05fc9ac522c22b0d0e53aaa83a6
 SHA512:
-  metadata.gz: 75c2cb138d038891fb8a4dae8d750d94192db93536c03b627265d18f706a61a49a76ef0500597de06b0910f23e3f97c245c042bad548be7e641b8a4069eab999
-  data.tar.gz: 15daa18cbd6fa5ac2edc87bf57ee201b7e827b981ac5c8ff8d6043f67999c7511cdffe2a3a3dd7a852f6ec2cd535517a45437a8f9f732a70d09ae87d2537c98f
+  metadata.gz: f38c5c0ed18e56f998ffbebe171f775ca4275ccb5b630851df266391fabf16d6204bf316ab1162f0ccfc16da916d578a746c4261728e1acc9707dda689dc0341
+  data.tar.gz: 35aab050d28d1d51c4494743c372687665dbb9f5f2ce182670bb72d2a83992ef6366bd042457625040d23a35d8eae7db8d606a468ce6d33d8a00d6199a778fcd

data/GUIA.md

@@ -1,6 +1,6 @@
 # Guía para usar la línea de comandos de Bootic (Bootic CLI)
 
-El CLI de Bootic es una herramienta para diseñadores y desarrolladores que
+El [CLI de Bootic](https://github.com/bootic/bootic_cli) es una herramienta para diseñadores y desarrolladores que
 quieran realizan tareas con la API de Bootic en forma local, ya sea para ver
 o modificar datos, o bien para realizar cambios en la plantilla de la tienda.
 

data/lib/bootic_cli/cli.rb

@@ -161,8 +161,7 @@ module BooticCli
         require 'irb'
         require 'irb/completion'
         IRB.setup nil
-        IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
-        require 'irb/ext/multi-irb'
+
         require 'bootic_cli/console'
         context = Console.new(session)
         prompt = "/#{shop.subdomain} (#{root.user_name}|#{root.scopes}) $ "
@@ -174,14 +173,22 @@ module BooticCli
           :PROMPT_N => prompt,
           :RETURN => "=> %s\n"
         }
+
         IRB.conf[:PROMPT_MODE] = :CUSTOM
         IRB.conf[:AUTO_INDENT] = false
+        irb = IRB::Irb.new(IRB::WorkSpace.new(context))
+        IRB.conf[:MAIN_CONTEXT] = irb.context
+
+        trap('SIGINT') do
+          irb.signal_handle
+        end
 
         begin
-          IRB.irb nil, context
-        rescue ThreadError => e
-          # puts "#{e.class} -> #{e.message}"
-          exit(1)
+          catch(:IRB_EXIT) do
+            irb.eval_input
+          end
+        ensure
+          IRB.irb_at_exit
         end
       end
     end

data/lib/bootic_cli/commands/themes.rb

@@ -133,8 +133,15 @@ module BooticCli
 
       desc 'watch', 'Watch local theme dir and update remote when any file changes'
       option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Pushes any changes to public theme, even if dev theme exists'
+      option :force, banner: '<true|false>', type: :boolean, aliases: '-f', desc: 'Force watch to run even if lockfile is found'
       def watch
         within_theme do
+          if options['force'].nil? && has_lockfile?
+            prompt.say("Looks like there's another process already watching this dir.")
+            prompt.say("If this is not the case, please run this command with --force (or -f)")
+            abort
+          end
+
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
           warn_about_public if remote_theme.public? and options['public'].nil?
 
@@ -146,6 +153,8 @@ module BooticCli
             end
           end
 
+          write_lockfile
+          at_exit { remove_lockfile }
           workflows.watch(current_dir, remote_theme)
         end
       end
@@ -228,6 +237,20 @@ module BooticCli
 
       private
 
+      DEFAULT_LOCKFILE = '.lock'.freeze
+
+      def has_lockfile?(dir = current_dir, filename = DEFAULT_LOCKFILE)
+        File.exist?(File.join(dir, filename))
+      end
+
+      def write_lockfile(dir = current_dir, filename = DEFAULT_LOCKFILE)
+        File.open(File.join(dir, filename), 'w') { |f| f.write($$) }
+      end
+
+      def remove_lockfile(dir = current_dir, filename = DEFAULT_LOCKFILE)
+        FileUtils.rm_f(File.join(dir, filename))
+      end
+
       def warn_about_public
         unless prompt.yes_or_no?("You're pushing changes directly to your public theme. Are you sure?", true)
           prompt.say("Ok, sure. You can skip the above warning prompt by passing a `--public` flag.")

data/lib/bootic_cli/themes/workflows.rb

@@ -216,8 +216,12 @@ module BooticCli
 
         # ctrl-c
         Signal.trap('INT') {
-          listener.stop
-          puts 'See you in another lifetime, brother.'
+          begin
+            listener.stop
+          rescue ThreadError => e # cant be called from trap context
+            # nil
+          end
+          puts "\nSee you in another lifetime, brother."
           exit
         }
 
@@ -318,6 +322,7 @@ module BooticCli
       end
 
       def upsert_file(theme, path)
+        return if File.basename(path)[0] == '.' # filter out .lock and .state
         item, type = FSTheme.resolve_file(path)
         handle_file_errors(type, item) do
           case type

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '0.6.7'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Bootic command-line client.