bootic_cli 0.2.0.pre3 → 0.2.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e431e8096c1631c299bef2480ee7b8790df2a84
-  data.tar.gz: 0e0feeb799a8c2bd9a8158511b6efaaedab31cd3
+  metadata.gz: 01b310353094a4af7a0b179b02660c020fb98480
+  data.tar.gz: 2583f1d57a24e858ef0ba028f8c4696cf7496ade
 SHA512:
-  metadata.gz: 34e96a633bb6bae2d620c0cb4d12dffdcf0fc6343c0cff50a996400021a56d0cb3ca42970b85f3c8ee32d4b5bca51fcc54020c19a0a171761fd960f527612d11
-  data.tar.gz: ce7c0a78c0a5152dfd82f8568f69e534069a3c97b966bdd93cfeef64fd287f8dc170cfa3a8b520e4dbebcc2b3de9af4c1bd8f7f6842579dc8bef8d3185e4cde0
+  metadata.gz: ff09b1ba8c214698dc2a1d4ff033b2de5d72c9163aee1c0aea2c2a1f6b361dd1d17c8df18da43af385281c52bd4a1fb22310534ebce6d75fc3f061495b8716ba
+  data.tar.gz: ed01f33cbfc925e52309306b6ec57a61944171f1a554d8f7792f7536a25044fe4f3611a0cb28cc43004d949beddd4df5f1ca4bf210dc787e6adc2093327f5944

data/bootic_cli.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'thor'
+  spec.add_dependency 'thor', '~> 0'
   spec.add_dependency 'bootic_client', "~> 0.0.19"
   spec.add_dependency 'diffy', "~> 3.2"
   spec.add_dependency 'listen', "~> 3.1"
-  spec.add_dependency 'launchy'
+  spec.add_dependency 'launchy', "~> 2.4"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "byebug", "~> 9"
 
   spec.post_install_message = <<-END
 Bootic client installed.

data/lib/bootic_cli/commands/themes.rb

@@ -5,9 +5,19 @@ require 'bootic_cli/themes/theme_selector'
 module BooticCli
   module Commands
     class Themes < BooticCli::Command
-      desc 'pull [shop] [dir]', 'Pull latest theme changes in [shop] into directory [dir] (current by default)'
+      desc 'clone [shop] [dir]', 'Clone remote [shop] theme into directory [dir] (shop subdomain by default)'
       option :destroy, banner: '<true|false>', type: :boolean, default: true
       option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      def clone(subdomain = nil, dir = nil)
+        logged_in_action do
+          local_theme, remote_theme = theme_selector.setup_theme_pair(subdomain, dir, options['public'])
+          workflows.pull(local_theme, remote_theme, destroy: options['destroy'])
+        end
+      end
+
+      desc 'pull', 'Pull remote changes into current theme directory'
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      option :destroy, banner: '<true|false>', type: :boolean, default: true
       def pull(subdomain = nil, dir = '.')
         logged_in_action do
           local_theme, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
@@ -65,7 +75,15 @@ module BooticCli
       def open(subdomain = nil, dir = '.')
         logged_in_action do
           _, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
-          Launchy.open remote_theme.href
+          Launchy.open remote_theme.path
+        end
+      end
+
+      desc 'pair [shop]', 'Pair this directory to remote [shop]'
+      def pair(subdomain, dir = '.')
+        logged_in_action do
+          local_theme = theme_selector.pair(subdomain, dir)
+          say "Directory #{local_theme.path} paired with shop #{subdomain}", :yellow
         end
       end
 

data/lib/bootic_cli/themes/api_theme.rb

@@ -32,7 +32,7 @@ module BooticCli
         end
       end
 
-      def href
+      def path
         theme.rels[:theme_preview].href
       end
 

data/lib/bootic_cli/themes/fs_theme.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'yaml/store'
 
 module BooticCli
   module Themes
@@ -30,10 +31,21 @@ module BooticCli
         [item, type]
       end
 
-      def initialize(dir)
-        FileUtils.mkdir_p dir
-        FileUtils.mkdir_p File.join(dir, ASSETS_DIR)
+      attr_reader :subdomain
+
+      def initialize(dir, subdomain: nil)
         @dir = dir
+        @setup = false
+        @subdomain = subdomain ? write_subdomain(subdomain) : read_subdomain
+      end
+
+      def reset!
+        return false unless @setup
+        FileUtils.rm_rf dir
+      end
+
+      def path
+        File.expand_path(dir)
       end
 
       # Implement generic Theme interface
@@ -63,6 +75,7 @@ module BooticCli
       end
 
       def add_template(file_name, body)
+        setup
         path = File.join(dir, file_name)
 
         File.open(path, 'w') do |io|
@@ -79,6 +92,7 @@ module BooticCli
       end
 
       def add_asset(file_name, file)
+        setup
         path = File.join(dir, ASSETS_DIR, file_name)
         File.open(path, 'wb') do |io|
           io.write file.read
@@ -102,6 +116,32 @@ module BooticCli
       def paths_for(patterns)
         patterns.reduce([]) {|m, pattern| m + Dir[File.join(dir, pattern)]}
       end
+
+      def setup
+        return self if @setup
+        FileUtils.mkdir_p dir
+        FileUtils.mkdir_p File.join(dir, ASSETS_DIR)
+        @setup = true
+        self
+      end
+
+      def store
+        @store ||= (
+          setup
+          YAML::Store.new(File.join(path, '.state'))
+        )
+      end
+
+      def write_subdomain(sub)
+        store.transaction do
+          store['subdomain'] = sub
+        end
+        sub
+      end
+
+      def read_subdomain
+        store.transaction{ store['subdomain'] }
+      end
     end
   end
 end

data/lib/bootic_cli/themes/theme_selector.rb

@@ -1,4 +1,3 @@
-require 'yaml/store'
 require 'bootic_cli/themes/api_theme'
 require 'bootic_cli/themes/fs_theme'
 
@@ -10,38 +9,49 @@ module BooticCli
         @prompt = prompt
       end
 
+      def setup_theme_pair(subdomain, dir = nil, production = false)
+        shop = find_remote_shop(subdomain)
+        raise "no shop with subdomain #{subdomain}" unless shop
+
+        path = dir || shop.subdomain
+        local_theme = select_local_theme(path, shop.subdomain)
+        remote_theme = select_remote_theme(shop, production)
+
+        prompt.say "Cloning theme files into #{local_theme.path}"
+        prompt.say "Preview remote theme at #{remote_theme.path}", :yellow
+        [local_theme, remote_theme]
+      end
+
       def select_theme_pair(subdomain, dir, production = false)
         local_theme = select_local_theme(dir)
-        st = YAML::Store.new(File.join(File.expand_path(dir), '.state'))
-        shop = resolve_and_store_shop(subdomain, dir)
-        remote_theme = resolve_remote_theme(shop, production)
-        prompt.say "Preview remote theme at #{remote_theme.rels[:theme_preview].href}", :yellow
-        [local_theme, APITheme.new(remote_theme)]
+        shop = find_remote_shop(local_theme.subdomain)
+        raise "no shop with subdomain #{local_theme.subdomain}" unless shop
+        remote_theme = select_remote_theme(shop, production)
+
+        prompt.say "Preview remote theme at #{remote_theme.path}", :yellow
+        [local_theme, remote_theme]
       end
 
-      def select_local_theme(dir)
-        FSTheme.new(File.expand_path(dir))
+      def pair(subdomain, dir)
+        shop = find_remote_shop(subdomain)
+        raise "no shop with subdomain #{subdomain}" unless shop
+        select_local_theme(dir, subdomain)
       end
 
-      def resolve_and_store_shop(subdomain, dir)
-        st = YAML::Store.new(File.join(File.expand_path(dir), '.state'))
-        st.transaction do
-          sub = st['subdomain']
-          if sub
-            shop = find_remote_shop(sub)
-            raise "No shop could be resolved with subdomain: #{subdomain} and dir: #{dir}" unless shop
-            shop
-          else # no subdomain stored yet. Resolve and store.
-            shop = resolve_shop_from_subdomain_or_dir(subdomain, dir)
-            st['subdomain'] = shop.subdomain
-            shop
-          end
-        end
+      def select_local_theme(dir, subdomain = nil)
+        FSTheme.new(File.expand_path(dir), subdomain: subdomain)
       end
 
-      private
+      def select_remote_theme(shop, production = false)
+        theme = resolve_remote_theme(shop, production)
+        APITheme.new(theme)
+      end
+
+      def find_remote_shop(subdomain = nil)
+        if !subdomain
+          return root.shops.first
+        end
 
-      def find_remote_shop(subdomain)
         if root.has?(:all_shops)
           root.all_shops(subdomains: subdomain).first
         else
@@ -49,15 +59,7 @@ module BooticCli
         end
       end
 
-      def resolve_shop_from_subdomain_or_dir(subdomain, dir)
-        shop = if subdomain
-          find_remote_shop(subdomain)
-        elsif dir
-          subdomain = File.basename(dir)
-          find_remote_shop(subdomain)
-        end
-        shop || root.shops.first
-      end
+      private
 
       def resolve_remote_theme(shop, production = false)
         if production

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.2.0.pre3"
+  VERSION = "0.2.0.pre4"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre3
+  version: 0.2.0.pre4
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,16 +70,16 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9'
 description: Bootic command line.
 email:
 - ismaelct@gmail.com
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Bootic command line.