squared 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef428776d582a23bb5560efdc5c6f6d77fa5fb1adaecca5f11500b978126283a
-  data.tar.gz: cd8dfbae3f5162b55fd081ac65e31f0e2fca1167d4932e52ccd723f128a1a312
+  metadata.gz: 1795e8352e8278c8f4e26ced26ac936ce906ee8e626a9cf2ff2bf6a86412f09c
+  data.tar.gz: '08b8e2538b6316ffb141c15e560187222cbb18e0a37f5c74af6ed5fda87e6dc3'
 SHA512:
-  metadata.gz: e8bf3197a021dadc3bf8d15d4f80d5064a4254359a23b9e7576babe716189e0d17564acae48e018fc64b7caddde250f53eb479cae3e4997d7a3792fe66e07d5a
-  data.tar.gz: 312231359e1bd8f7052c91250234750ba9c41f5be1b806e852c60517d4c04e8d4ef55450d1b65fb35a946b2c6138d83bccc8280587b6c5b9832d717fa377c84a
+  metadata.gz: a8d6bd537e66b744edd760ead7441aad45961bdc746e9ca81f577e8183893cd6209203f2ba507b5ab608bbf3ebe7a15aeb23aa84005a76bf10d0f3b3704c403d
+  data.tar.gz: 9a29c720ce14050bc604c9b561c376f55437865610827075dd6a2a961ce82b22c1f4b3fd303884186f9c59b1a330ed73ce14ad16169724c3578d8d4e01388bfe

data/lib/squared/config.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Squared
   module Config
     class Viewer
@@ -16,13 +18,14 @@ module Squared
 
       attr_reader :name, :main, :project, :theme
 
-      def initialize(main, name = nil, project: nil, opts: {}, auto: true, common: true)
+      def initialize(main, name = nil, project: nil, dump: nil, opts: {}, auto: true, common: true)
         if project
           main = @project.base_path(main).to_s if (@project = __get__(:project)[project.to_sym])
           @required = true
         end
         @name = name&.to_s || @project&.name
         @ext = File.extname(main)
+        @dump = dump
         @mime = {}
         @theme = common ? __get__(:theme)[:viewer] : {}
         if exist?
@@ -61,7 +64,6 @@ module Squared
             if @mime['json'] && (exist? || !::Rake::Task.task_defined?("#{name}:#{view}:json"))
               desc format_desc(view, %w[json])
               task :json, [:keys] do |_, args|
-                require 'json'
                 read_keys(JSON, 'json', *params.(args))
               end
             end
@@ -79,18 +81,17 @@ module Squared
         yield self if block_given?
       end
 
-      def add(type, gem: nil, parse: nil, ext: [], opts: {}, command: 'view', file: nil)
+      def add(type, gem: nil, parse: nil, ext: nil, opts: {}, command: 'view', file: nil, exist: nil)
         return self if @mime.frozen?
 
         type = type.to_s
         if parse && enabled?
           require(gem || type)
           obj = eval(parse)
-          ext = as_a(ext)
-          ext << type if ext.empty?
+          ext << type if (ext = as_a(ext)).empty?
           file = realpath if file.nil? && exist?
           namespace name do
-            desc format_desc(command, ext)
+            desc format_desc(command, ext, exist: exist)
             namespace command do
               task type, [:keys] do |_, args|
                 if file
@@ -128,7 +129,7 @@ module Squared
           end
         end
         name ||= file.basename.to_s.chomp(File.extname(file))
-        add(type, gem: gem, parse: parse, ext: ext, opts: opts, command: name, file: file)
+        add(type, gem: gem, parse: parse, ext: ext, opts: opts, command: name, file: file, exist: true)
       end
 
       def style(name, *args)
@@ -234,16 +235,14 @@ module Squared
                 $2 ? ".#{s}" : "#{s}."
               end
             end
-            out << [key, pipe? ? nil : 'undefined']
+            out << [key, pipe? ? JSON.dump(nil) : 'undefined']
           else
-            out << [key, pipe? ? val : val.inspect]
+            out << [key, @dump == 'json' || pipe? ? JSON.dump(val) : val.inspect]
           end
-          pad = key.size if key.size > pad
+          pad = [pad, key.size].max
         end
         if pipe?
-          require 'json'
-          out = out.map { |item| JSON.dump(item[1]) }
-          puts out.join("\n")
+          puts out.map(&:last).join("\n")
         else
           out.map { |item| "#{item[0].ljust(pad)} : #{item[1]}" }
         end
@@ -264,8 +263,8 @@ module Squared
         end
       end
 
-      def format_desc(command, ext)
-        message(name, command, "#{ext.first}[#{exist? ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys*]")
+      def format_desc(command, ext, exist: exist?)
+        message(name, command, "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys*]")
       end
 
       def realpath

data/lib/squared/repo/project/node.rb

@@ -71,7 +71,7 @@ module Squared
                     when :install
                       desc format_desc(action, flag)
                       task flag do
-                        install flag
+                        depend(flag, override: true)
                       end
                     when :outdated
                       desc format_desc(action, flag, %w[prune dry-run], req: 'opts?')
@@ -134,10 +134,10 @@ module Squared
           end
         end
 
-        def depend(flag = nil)
-          if @depend
+        def depend(flag = nil, override: false)
+          if @depend && !override
             super
-          else
+          elsif outdated?
             frozen = flag == :frozen
             force = flag == :force
             dedupe = flag == :dedupe

data/lib/squared/repo/project/python.rb

@@ -59,7 +59,7 @@ module Squared
                       desc options.()
                     end
                     task flag do |_, args|
-                      install(flag, opts: collect_args(args, :opts))
+                      depend(flag, opts: collect_args(args, :opts), override: true)
                     end
                   end
                 end
@@ -68,8 +68,8 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [])
-          if @depend
+        def depend(flag = nil, opts: [], override: false)
+          if @depend && !override
             super
           elsif outdated?
             case install_type

data/lib/squared/repo/project/ruby.rb

@@ -7,7 +7,7 @@ module Squared
         REF = :ruby
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         OPT_INSTALL = %w[no-cache force quiet verbose].freeze
-        OPT_UPDATE = %w[redownload local strict conservative quiet verbose].freeze
+        OPT_UPDATE = %w[redownload local strict conservative group=s quiet verbose].freeze
         private_constant :REF, :GEMFILE, :OPT_INSTALL, :OPT_UPDATE
 
         class << self
@@ -80,12 +80,12 @@ module Squared
                       when :'with-g', :'without-g'
                         desc format_desc(action, flag, 'group+')
                         task flag, [:group] do |_, args|
-                          install(flag, group: collect_args(args, :group))
+                          depend(flag, group: collect_args(args, :group), override: true)
                         end
                       else
                         desc format_desc(action, flag, OPT_INSTALL)
                         task flag, [:opts] do |_, args|
-                          install(flag, opts: collect_args(args, :opts))
+                          depend(flag, opts: collect_args(args, :opts), override: true)
                         end
                       end
                     when :update
@@ -106,10 +106,10 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [], group: [])
-          if @depend
+        def depend(flag = nil, opts: [], group: [], override: false)
+          if @depend && !override
             super
-          else
+          elsif outdated?
             case flag
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install'
@@ -248,7 +248,9 @@ module Squared
         end
 
         def outdated?
-          GEMFILE.any? { |file| base_path(file).exist? }
+          return @outdated unless @outdated.nil?
+
+          @outdated = GEMFILE.any? { |file| base_path(file).exist? }
         end
 
         def dev?
@@ -261,7 +263,13 @@ module Squared
           if (val = env('BUNDLE_JOBS')).to_i > 0
             @session << "-j#{val}"
           end
-          list.each { |flag| @session << "--#{flag}" if opts.include?(flag) }
+          list.each do |flag|
+            if opts.include?(flag)
+              @session << "--#{flag}"
+            elsif /^g(?:roup)?=(.+)$/.match(flag)
+              @session << "--group=#{$1}"
+            end
+          end
         end
 
         def gem_session(*cmd)

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - An Pham