sbs 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573b2bf7bfb628e62c77c3dbb67cc56e8d0e358b6270dbd3ba91957457f3348a
-  data.tar.gz: a7794466413b9a242d3d683161f7519ea4cf76dcad61d786ff85528cfde16412
+  metadata.gz: c09b9e62e269e00ce7a59ea445749a7346ee6e1dfb865a71c35ebd45fac64e20
+  data.tar.gz: d7a42b7e217af7af1b3e93c14767c2b7c9a761ac4201c0acdb35a0708d4b033f
 SHA512:
-  metadata.gz: c6c75c40d261ce3202c68410f1170e898b130f6d2d56111ccc32194f1ca4a753e9b8dbbf58509ea3d44b2665cfa190a8d84e67fe9dd35afc4949cb45380124de
-  data.tar.gz: 89b4f92e45b10ed8aa3f2a5a9d5930f49d9dd1e6dec842353071ac70ebe893b503c2449fd6f5ad43815810c506b173ab886b22b2d3be52b2690c4aab592df5e3
+  metadata.gz: 41275828fe782399f0be83335d66711c905eefc679ce7d2d9040f13382e2d72d9c9173d908c45e6db45bf53e4a6e47d76e69f766200ffe3193f28484c9962c60
+  data.tar.gz: 9d4c1747cbc25e69e1a1dedc2dc19914ef3202a9707569e2a9015c5296132cc1465a6122c7503f15fd7e68fa429120a990cbcc2930556228f5f3c257ac6972b1

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    sbs (0.1.3)
+    sbs (0.1.5)
       activesupport (~> 5.2.3)
+      colorize (~> 0.8.1)
       thor (~> 0.20.3)
 
 GEM
@@ -13,6 +14,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    colorize (0.8.1)
     concurrent-ruby (1.1.5)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)

data/README.md

@@ -1,6 +1,6 @@
 # sbs
 
-A better cli tool for substrate development.
+A better substrate up tool.
 
 ## Installation
 
@@ -20,23 +20,38 @@ Or install it yourself as:
 
 ## Usage
 
-```shell
-# default branch is master
-sbs new testchain
-
-sbs new testchain -b v1.0
-
-sbs new testchain -b v1.0 -a author_name
-
-# Check the rust environment and substrate commits used by your project. Do it in your project directory.
-sbs check
-
-# Show the difference between your substrate version and branch head. Do it in your project directory.
-sbs diff
-
-sbs -h
-
-```
+- **new**: generate new blockchain from node-template
+
+  ```shell
+  # Default branch is master
+  sbs new testchain
+  
+  sbs new testchain -b v1.0
+  
+  sbs new testchain -b v1.0 -a author
+  ```
+
+- **check**: Check your rust environment and substrate commits used by your project. Do it in your project directory
+
+  ```shell
+  sbs check
+  ```
+
+- **diff**: Compare the difference between your node-template and the branch's node-template
+
+  ```shell
+  # If fzf installed, a selectable diff list will appear, and the diff content will be displayed when you choose.
+  # If no fzf, all diffs with content will be shown.
+  sbs diff -b v1.0
+  
+  # Only list diffs without content.
+  sbs diff -l -b v1.0
+  
+  # Default branch is master.
+  sbs diff
+  ```
+
+  [fzf](https://github.com/junegunn/fzf) is a great command-line fuzzy finder.
 
 ## Development
 

data/lib/sbs/version.rb

@@ -1,3 +1,3 @@
 module Sbs
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/sbs.rb

@@ -3,6 +3,7 @@ require "thor"
 require "fileutils"
 require "find"
 require "active_support/core_ext/string"
+require "colorize"
 
 module Sbs
   class Error < StandardError; end
@@ -68,6 +69,8 @@ module Sbs
     end
 
     desc "diff", "Show the difference between your substrate version and branch head. Do it in your project directory."
+    option :list, :aliases => :l, :type => :boolean
+    option :full, :aliases => :f, :type => :boolean
     option :branch, :aliases => :b, :default => "master"
     def diff
       commits = get_commits
@@ -86,54 +89,78 @@ module Sbs
       FileUtils.mkdir_p(tmp_dir_2)
 
       # Compare the differences between the node-template you depend on and the latest node-template of the branch
-      copy_node_template(commit, tmp_dir_1)
-      copy_node_template(options[:branch], tmp_dir_2)
-
-      result = `diff -rq #{tmp_dir_1}/node-template #{tmp_dir_2}/node-template`
-      result.each_line do |line|
-        if line.start_with?("Files")
-          scans = line.scan(/Files (.+) and (.+) differ/)
-          file1 = scans[0][0]
-          file2 = scans[0][1]
-
-          puts "-------------------------------------------"
-          puts line.gsub(tmp, "")
-          puts `diff -u #{file1} #{file2}`.gsub(tmp, "")
-          puts "\n"
-        else
-          puts "-------------------------------------------"
-          puts line.gsub(tmp, "")
-          puts "\n"
+      node_template_1 = copy_node_template(commit, tmp_dir_1)
+      node_template_2 = copy_node_template(options[:branch], tmp_dir_2)
+
+      diff_cmd = "diff -rq #{tmp_dir_1}/#{node_template_1} #{tmp_dir_2}/#{node_template_2}"
+
+      if (not options[:list]) && (not options[:full]) && (`fzf --version` =~ /^\d+\.\d+\.\d /)
+        diff = `#{diff_cmd} | fzf`
+        show_file_diff(tmp, diff)
+      else
+        diffs = `#{diff_cmd}`
+        diffs.each_line do |diff|
+          if options[:list]
+            puts(diff.gsub(tmp, "").colorize(:green).underline) unless diff.include?("Cargo.lock")
+          else
+            show_file_diff(tmp, diff) unless diff.include?("Cargo.lock")
+          end
         end
-      end
-
-      `rm -rf #{tmp_dir_1} && rm -rf #{tmp_dir_2}`
+      end 
     end
 
     private
     def copy_node_template(branch_or_commit, dest_dir)
+      # clone or update substrate
       home = File.join(Dir.home, ".sbs")
       Dir.mkdir(home) if not Dir.exist?(home)
       substrate_dir = File.join(home, "substrate")
 
       if not Dir.exist?(substrate_dir)
-        `git clone https://github.com/paritytech/substrate #{substrate_dir}`
+        `git clone -q https://github.com/paritytech/substrate #{substrate_dir}`
       end
 
-      # checkout branch or commit
+      Dir.chdir substrate_dir do
+        `git checkout -q master`
+        `git pull -q`
+      end
+
+      # check exist
       Dir.chdir substrate_dir do
         if `git cat-file -t #{branch_or_commit}`.strip != "commit"
-          puts "Not a valid branch or commit"
-          return
-        else
-          `git checkout -q #{branch_or_commit}`
-          if `git show-ref refs/heads/#{branch_or_commit}`.strip != "" # this is a branch
-            `git pull`
-          end
+          raise "Not a valid branch or commit: #{branch_or_commit}"
         end
       end
 
-      `cp -R #{substrate_dir}/node-template #{dest_dir}`
+      # get commit if it is a branch
+      commit = `git ls-remote https://github.com/paritytech/substrate refs/heads/#{branch_or_commit} | cut -f 1`.strip
+      commit = branch_or_commit if commit == "" 
+
+      # checkout commit and then copy to dest dir
+      node_template_name = "node-template-#{commit[0 .. 9]}"
+      if not Dir.exist?("#{dest_dir}/#{node_template_name}")
+        Dir.chdir substrate_dir do
+          `git checkout -q #{commit}`
+          `cp -R ./node-template #{dest_dir}/#{node_template_name}`
+        end
+      end
+
+      return node_template_name
+    end
+
+    def show_file_diff(tmp, diff)
+      if diff.start_with?("Files")
+        scans = diff.scan(/Files (.+) and (.+) differ/)
+        file1 = scans[0][0]
+        file2 = scans[0][1]
+
+        puts diff.gsub(tmp, "").colorize(:green).underline
+        puts `diff -u #{file1} #{file2}`.gsub(tmp, "")
+        puts "\n"
+      else
+        puts diff.gsub(tmp, "").colorize(:green).underline
+        puts "\n"
+      end
     end
 
     def generate_from_node_template(chain_name, branch_or_commit, author, dest_dir)

data/sbs.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 0.20.3"
   spec.add_dependency "activesupport", "~> 5.2.3"
+  spec.add_dependency "colorize", "~> 0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - wuminzhe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: A better cli tool for substrate development
 email:
 - wuminzhe@gmail.com