desktop-boom 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 547d447776351c8de974b75d424e32efd1ec6e76
-  data.tar.gz: 4d439cecb4cc7bc8a3a79070b6c6283f56fc129a
+  metadata.gz: fd8dab305f791bf40d2f3a977ee742576070cee3
+  data.tar.gz: cac3af03a8f2b2f1a783ce87c41deef5cb43ca7a
 SHA512:
-  metadata.gz: a641c607de91bfbf4e1e7bf415b42799349233e24d6d8306379db1d19c9273c1de3bdf691a002d02aa3b212043a9f29b6b2e71aee71f72c9f23f70b016ed36a9
-  data.tar.gz: e69695c049a3e9f7c3fe488f09e431a2699ba047c8dcf859418b3b34a08f3a6f3c83b5a07c9e5bf1e009acfedb0dc77e666cd31c58e0069e108c719deff278ea
+  metadata.gz: 88629d36b73974e4a520e63ab95b6037a23c025e2cd30a61e2d2a8fd7e39d6c668a537b662f34409ec358d6c5f94b3d39abbd0a11a64dd1f08930ca66e25b451
+  data.tar.gz: b763052e70df7f3d256584ba1756ce794f47cbbdfe820d778e977a2b3d4a42b2084d96bc1b6d6d53df71852f86340f20f1f3cf410ccd44eb0beeb574a54cf0e7

data/bin/boom

@@ -34,6 +34,7 @@ If `B` doesn't exist yet, it will be created.
 
 program :version, DesktopBoom::VERSION
 program :description, HELP_STRING
+program :help, 'Author', 'Hwee-Boon Yar <hboon@motionobj.com>'
 
 default_command :switch
 
@@ -41,6 +42,25 @@ def config_path
   File.expand_path("~/.config/#{APP_NAME}.yml")
 end
 
+def with_config(&block)
+  File.open(config_path) do |f|
+    mapping = Psych.load(f.read)
+    projects_directory = mapping['projects_directory']
+    current_project = mapping['current_project']
+    block.call(mapping, projects_directory, current_project)
+  end
+end
+
+def projects
+  with_config do |mapping, projects_directory, current_project|
+    return Dir.entries(File.expand_path(projects_directory)).reject {|e| e == '.' || e == '..' || !File.directory?(File.expand_path(e, projects_directory))}
+  end
+end
+
+def entries_in_dir(dir)
+  entries = Dir.entries(dir).reject {|e| e == '.' || e == '..' || e.start_with?('.')}
+end
+
 command :switch do |c|
   c.syntax = "#{APP_NAME} [switch]"
   c.summary = 'Switch project'
@@ -54,11 +74,7 @@ doesn't exist, it will be created:
 " and abort if args.empty?
     new_project = args[0]
     create_configuration_file unless File.file? config_path
-    File.open(config_path) do |f|
-      mapping = Psych.load(f.read)
-      projects_directory = mapping['projects_directory']
-      current_project = mapping['current_project']
-
+    with_config do |mapping, projects_directory, current_project|
       if new_project == current_project
         say "Already at project '#{current_project}'"
         break
@@ -77,10 +93,7 @@ command :current do |c|
   c.example 'Run command', "$ #{APP_NAME} current"
   c.action do |args, options|
     create_configuration_file unless File.file? config_path
-    File.open(config_path) do |f|
-      mapping = Psych.load(f.read)
-      projects_directory = mapping['projects_directory']
-      current_project = mapping['current_project']
+    with_config do |mapping, projects_directory, current_project|
       say current_project
     end
   end
@@ -94,22 +107,18 @@ command :list do |c|
   c.option '-l', 'List in long format'
   c.action do |args, options|
     create_configuration_file unless File.file? config_path
-    File.open(config_path) do |f|
-      mapping = Psych.load(f.read)
-      projects_directory = mapping['projects_directory']
-      projects = Dir.entries(File.expand_path(projects_directory)).reject {|e| e == '.' || e == '..' || !File.directory?(File.expand_path(e, projects_directory))}
-      current_project = mapping['current_project']
+    with_config do |mapping, projects_directory, current_project|
       projects.each do |e|
         if e == current_project
           if options.l
-            entries = Dir.entries(File.expand_path(DESKTOP_DIR)).reject {|e| e == '.' || e == '..' || e.start_with?('.')}
+            entries = entries_in_dir(File.expand_path(DESKTOP_DIR))
             say "#{e} (#{entries.size}) <="
           else
             say "#{e} <="
           end
         else
           if options.l
-            entries = Dir.entries(File.expand_path(e, projects_directory)).reject {|e| e == '.' || e == '..' || e.start_with?('.')}
+            entries = entries_in_dir(File.expand_path(e, projects_directory))
             say "#{e} (#{entries.size})"
           else
             say e
@@ -129,11 +138,7 @@ command :rename do |c|
     say_error "You must specify both the original project name and the new project name
   $ #{APP_NAME} rename <source> <target>
     " and abort unless args.size == 2
-    File.open(config_path) do |f|
-      mapping = Psych.load(f.read)
-      projects_directory = mapping['projects_directory']
-      current_project = mapping['current_project']
-      projects = Dir.entries(File.expand_path(projects_directory)).reject {|e| e == '.' || e == '..' || !File.directory?(File.expand_path(e, projects_directory))}
+    with_config do |mapping, projects_directory, current_project|
       source = args[0]
       destination = args[1]
       say_error "Project does not exist: `#{source}`" and abort unless (projects + [current_project]).include? source
@@ -144,6 +149,21 @@ command :rename do |c|
   end
 end
 
+command :close do |c|
+  c.syntax = "#{APP_NAME} close"
+  c.summary = 'Close current project'
+  c.description = c.summary
+  c.example 'Run command', "$ #{APP_NAME} close"
+  c.action do |args, options|
+    create_configuration_file unless File.file? config_path
+    with_config do |mapping, projects_directory, current_project|
+      break unless current_project && !current_project.empty?
+      move_desktop_to_project(current_project, projects_directory)
+      switch_to(mapping, '')
+    end
+  end
+end
+
 def create_configuration_file
   write_configuration(nil)
 end

data/lib/boom/version.rb

@@ -1,3 +1,3 @@
 module DesktopBoom
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desktop-boom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hwee-Boon Yar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander