tmbundle-manager 0.1.0.pre3 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f32abf4b5ce55055841dbe347a9c715143146b
-  data.tar.gz: 07ab6f1206b3458849874a5239524d9157b3805c
+  metadata.gz: d6accee3952ebad16c5001d8a4d95b5487a45eac
+  data.tar.gz: 3b7abf9cba143af3e6f1ac3739139382ddb88202
 SHA512:
-  metadata.gz: 49de021c0e249769fea02108da7cf66a6b110231be5134de78dca0f58dfa2a2e672f85fe7a2166994ce5f48bf918f36b7b865332a8b1654ff1fd4ff958b259eb
-  data.tar.gz: 9c96a97acee53e0dd4c1b06d82a3a6db366630cc021fd047d8cd10eb468a656c17273ed5a81cfe7b4dae2997059cca51bf77345a763286574f1644cda181e502
+  metadata.gz: 266e073302e2c961c2008003bd4fd21b1f39ae5bcfa85aa4ae3da0e7afb03aab35b2355a856fca962e45112167f795b95479df483ff69ffaaf28385b881a1658
+  data.tar.gz: f386c44ff200a7e230ba97e34a8e43029400d54e6cbcf766463179dce04218556b6e9ebedd1435d7915a735ec293aea71eeccfbaa81ca8fa9a2ad3842300be76

data/README.md

@@ -1,5 +1,10 @@
 # TM Bundles/Package manager
 
+Install bundle from github easily:
+
+```shell
+tmb install elia/avian-missing
+```
 
 
 ## Installation
@@ -17,16 +22,17 @@ Use the `tmb` executable:
 $ tmb help
 
 Commands:
-  tmb edit PARTIAL_NAME  # Edit an installed bundle (name will be matched against PARTIAL_NAME)
-  tmb help [COMMAND]     # Describe available commands or one specific command
-  tmb update             # Update installed bundles
+  tmb edit PARTIAL_NAME    # Edit an installed bundle (name will be matched against PARTIAL_NAME)
+  tmb help [COMMAND]       # Describe available commands or one specific command
+  tmb install USER/BUNDLE  # Install a bundle from GitHub (e.g. tmb install elia/bundler)
+  tmb update               # Update installed bundles
 
 ```
 
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/tmbundle-manager/fork )
+1. Fork it ( https://github.com/elia/tmbundle-manager/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/tmbundle/bundle_name.rb

@@ -0,0 +1,22 @@
+module TMBundle
+  class BundleName
+    def initialize(name)
+      @name = name
+    end
+
+    attr_reader :name
+    private :name
+
+    def install_name
+      File.basename(name.gsub(/([\.\-_]tmbundle)?$/i, '.tmbundle'))
+    end
+
+    def repo_name
+      name+'.tmbundle' unless name =~ /([\.\-_]tmbundle)$/i
+    end
+
+    def git_url
+      "https://github.com/#{repo_name}.git"
+    end
+  end
+end

data/lib/tmbundle/manager/version.rb

@@ -1,5 +1,5 @@
 module Tmbundle
   module Manager
-    VERSION = '0.1.0.pre3'
+    VERSION = '0.1.0.pre4'
   end
 end

data/lib/tmbundle.rb

@@ -4,23 +4,10 @@ require 'thor'
 class TMBundle < Thor
   desc 'edit PARTIAL_NAME', 'Edit an installed bundle (name will be matched against PARTIAL_NAME)'
   def edit partial_name
-    matches = installed_bundles.select do |bundle|
-      bundle.name =~ /^#{partial_name}/i
-    end
-
-    if matches.size > 1
-      puts "please be more specific:"
-      matches.each_with_index {|m,i| puts " #{i+1}) #{m.name}"}
-      return false
-    end
-
-    if matches.empty?
-      puts "nothing found"
-      return false
-    end
-
-    bundle = matches.first
+    bundle = find_bundle(partial_name)
     mate bundle.path
+  rescue NotFound
+    return false
   end
 
   desc 'update', 'Update installed bundles'
@@ -42,7 +29,7 @@ class TMBundle < Thor
         end
 
         puts "------> Updating #{bundle.name}..."
-        system *%w[git pull --ff-only]
+        system(*%w[git pull --ff-only])
         success = $? == 0
         updated << bundle if success
         errored << bundle unless success
@@ -60,35 +47,90 @@ class TMBundle < Thor
     puts "Errored (#{errored.size})\n- #{errored.map(&:name).join("\n- ")}\n\n" if errored.any?
   end
 
-  desc 'install', 'Install a bundle from GitHub'
+  desc 'install USER/BUNDLE', 'Install a bundle from GitHub (e.g. tmb install elia/bundler)'
   def install name
     name = BundleName.new(name)
     install_path = bundles_dir.join(name.install_name).to_s
     system('git', 'clone', name.git_url, install_path)
   end
 
-  class BundleName
-    def initialize(name)
-      @name = name
+  desc 'path NAME', 'print path to bundle dir'
+  def path name
+    puts find_bundle(name).path
+  rescue NotFound
+    return false
+  end
+
+  desc 'status [BUNDLE]', 'Check the status of your local copy of the bundle'
+  def status name = nil
+    justification = 50
+    bundles_list.all.each do |bundle|
+      within bundle do
+        print "- #{bundle.name}...".ljust(justification)
+        # puts "-> fetching updates from remote..."
+        `git fetch -aq 2> /dev/null`
+        fetch_successful = $?.success?
+        # puts "-> checking status..."
+        branch_info, *changes = `git status -zb`.split("\0")
+        branch, remote, branch_status,  = branch_info.scan(/^## (\S+)\.\.\.(\S+)(?: \[(.+)\])?/).flatten
+        cd_hint = false
+
+        if changes.any?
+          cd_hint = true
+          print "✘ #{changes.size} changed/new file#{:s if changes.size != 0}.".ljust(justification)
+        else
+          case branch_status.to_s
+          when /^ahead (\d+)/
+            ahead_commits = $1
+            cd_hint = true
+            print "✘ #{ahead_commits} commits ahead of #{remote}. ".ljust(justification)
+          when /^behind (\d+)/
+            behind_commits = $1
+            cd_hint = true
+            print "❍ behind remote (#{remote}) by #{behind_commits}. ".ljust(justification)
+          else
+            print "✔︎ up-to-date"
+          end
+        end
+        print "$ cd \"#{bundle.path}\" # to enter the bundle directory" if cd_hint
+        puts
+        puts "#{' '*justification}✘✘✘ Something went wrong while fetching from remote #{remote}" unless fetch_successful
+      end
+    end
+  end
+
+  desc 'list', 'lists all installed bundles'
+  def list
+    bundles_list.all.each do |bundle|
+      puts "- #{bundle.name.ljust(30)} (#{bundle.path})"
     end
+  end
+
 
-    attr_reader :name
-    private :name
 
-    def install_name
-      File.basename(name.gsub(/([\.\-_]tmbundle)?$/i, '.tmbundle'))
+  private
+
+  def find_bundle(partial_name)
+    matches = installed_bundles.select do |bundle|
+      bundle.name =~ /^#{partial_name}/i
     end
 
-    def repo_name
-      name+'.tmbundle' unless name =~ /([\.\-_]tmbundle)$/i
+    if matches.size > 1
+      puts "please be more specific:"
+      matches.each_with_index {|m,i| puts " #{i+1}) #{m.name}"}
+      raise NotFound
     end
 
-    def git_url
-      "https://github.com/#{repo_name}.git"
+    if matches.empty?
+      puts "nothing found"
+      raise NotFound
     end
+
+    matches.first
   end
 
-  private
+  class NotFound < StandardError
+  end
 
   def within bundle
     Dir.chdir bundle.path do
@@ -97,13 +139,25 @@ class TMBundle < Thor
   end
 
   def installed_bundles
-    @installed_bundles ||= Dir[bundles_dir.join('*').to_s].map {|path| Bundle.new(path)}
+    bundles_list.all
+  end
+
+  def bundles_list
+    @bundles_list ||= BundlesList.new(bundles_dir)
   end
 
   def bundles_dir
     @bundles_dir ||= Pathname('~/Library/Application Support/Avian/Bundles').expand_path
   end
 
+  class BundlesList < Struct.new(:dir)
+    def all
+      @all ||= Dir[dir.join('*/.git').to_s].map do |path|
+        Bundle.new(Pathname(path).join('..').to_s)
+      end
+    end
+  end
+
   class Bundle < Struct.new(:path)
     def name
       @name ||= File.basename(path, '.tmbundle')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmbundle-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -97,6 +97,7 @@ files:
 - Rakefile
 - bin/tmb
 - lib/tmbundle.rb
+- lib/tmbundle/bundle_name.rb
 - lib/tmbundle/manager.rb
 - lib/tmbundle/manager/server.rb
 - lib/tmbundle/manager/version.rb
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: TextMate 2 Bundle/Package Manager