screeninator 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,17 +1,24 @@
+1.0.4 / 2012-04-23
+------------------
+
+* 1 bugfix
+
+  * delete command now deletes both yml template and screen config files and removes the start_ alias.
+
 1.0.3 / 2011-07-07
 ------------------
 
 * 1 bugfix
-    
+
   * fix existing aliases being deleted when creating a new project
 
 1.0.2 / 2011-04-04
 ------------------
 
 * 1 bugfix
-  
+
   * fix whitespace issue in status line
-  
+
 * 5 enhancements
 
   * added help command. shows available commands and explanation

data/Rakefile

@@ -20,7 +20,7 @@ UPGRADE WARNING - If you have a custom default config, move it to ~/.screeninato
 Remember to add the following line to your .bashrc file
 
 [[ -s "$HOME/.screeninator/scripts/screeninator" ]] && source "$HOME/.screeninator/scripts/screeninator"
-  
+
 Message
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/screeninator/assets/sample.yml

@@ -12,4 +12,4 @@ tabs:
   - console: rails c
   - capistrano:
   - server: ssh me@myhost
-  
+

data/lib/screeninator/cli.rb

@@ -1,9 +1,9 @@
 require 'fileutils'
 
 # Author:: Jon Druse (mailto:jon@jondruse.com)
-# 
+#
 # = Description
-# 
+#
 # This class is where each screeninator command is implemented.
 #
 # == Change History
@@ -11,14 +11,18 @@ require 'fileutils'
 # * 03/15/11:: renmaed usage to help. adding option parser
 module Screeninator
   class Cli
-    
+
     class << self
       include Screeninator::Helper
-      
+
       def start(*args)
-        
+
         begin
-          self.send(args.shift, *args)
+          if args.empty?
+            self.help
+          else
+            self.send(args.shift, *args)
+          end
         rescue NoMethodError => e
           puts e
           self.help
@@ -30,7 +34,7 @@ module Screeninator
       def help
         puts HELP_TEXT
       end
-      
+
       # Open a config file, it's created if it doesn't exist already.
       def open(*args)
         @name = args.shift
@@ -45,43 +49,42 @@ module Screeninator
         system("$EDITOR #{config_path}")
         update(@name)
       end
-      
+
       def copy(*args)
         @copy = args.shift
         @name = args.shift
         @config_to_copy = "#{root_dir}#{@copy}.yml"
-        
+
         exit!("Project #{@copy} doesn't exist!")             unless File.exists?(@config_to_copy)
         exit!("You must specify a name for the new project") unless @name
-        
+
         file_path = "#{root_dir}#{@name}.yml"
-        
+
         if File.exists?(file_path)
           confirm!("#{@name} already exists, would you like to overwrite it? (type yes or no):") do
             FileUtils.rm(file_path)
             puts "Overwriting #{@name}"
           end
-          
+
         end
         open(@name)
       end
-      
+
       def delete(*args)
         puts "warning: passing multiple arguments to delete will be ignored" if args.size > 1
         filename = args.shift
-        file_path = "#{root_dir}#{filename}.yml"
-        
-        if File.exists?(file_path)
+        files = Dir["#{root_dir}#{filename}*"]
+
+        unless files.empty?
           confirm!("Are you sure you want to delete #{filename}? (type yes or no):") do
-            FileUtils.rm(file_path)
+            FileUtils.rm(files)
             puts "Deleted #{filename}"
           end
-        else
-          exit! "That file doesn't exist."
         end
-        
+
+        update
       end
-      
+
       def implode(*args)
         exit!("delete_all doesn't accapt any arguments!") unless args.empty?
         confirm!("Are you sure you want to delete all screeninator configs? (type yes or no):") do
@@ -94,21 +97,21 @@ module Screeninator
         puts "screeninator configs:"
         list
       end
-      
+
       def info(*args)
         puts "screeninator configs:"
         list(true)
       end
-      
+
       def update(*args)
         aliases = []
         Dir["#{root_dir}*.yml"].each do |path|
           begin
             path = File.basename(path, '.yml')
             config_name = path.split("/").last
-          
+
             begin; FileUtils.rm("#{path}.screen"); rescue; end
-          
+
             aliases << Screeninator::ConfigWriter.new(path).write!
           rescue ArgumentError => e
             puts e
@@ -116,8 +119,8 @@ module Screeninator
         end
         Screeninator::ConfigWriter.write_aliases(aliases)
       end
-      
-      def customize(*args)        
+
+      def customize(*args)
         @type = args.shift
         @action = args.shift
         if !['config','template'].include?(@type)
@@ -128,16 +131,16 @@ module Screeninator
         end
 
         FileUtils.mkdir_p(root_dir+"defaults")
-        
-        path = case @type 
+
+        path = case @type
         when "config"; USER_CONFIG
         when "template"; USER_SCREEN_CONFIG
         end
-        
+
         if @action.nil?
           system("$EDITOR #{path}")
         end
-        
+
         if @action == "delete"
           confirm!("Are you sure you want to delete #{path}? (type yes or no):") do
             FileUtils.rm(path)
@@ -145,25 +148,25 @@ module Screeninator
           end
         end
       end
-      
+
       private
-            
+
       def root_dir
         dir = "#{ENV["HOME"]}/.screeninator/"
       end
-      
+
       def sample_config
         "#{File.dirname(__FILE__)}/assets/sample.yml"
       end
-      
+
       def user_config
         @config_to_copy || USER_CONFIG
       end
-      
+
       def user_screen_config
         USER_SCREEN_CONFIG
       end
-      
+
       def list(verbose=false)
         Dir["#{root_dir}**"].each do |path|
           next unless verbose || File.extname(path) == ".yml"
@@ -171,9 +174,9 @@ module Screeninator
           puts "    #{path}"
         end
       end
-      
+
     end
-    
+
   end
 end
 

data/lib/screeninator/config_writer.rb

@@ -1,19 +1,19 @@
 module Screeninator
-  
+
   class ConfigWriter
-    
+
     include Screeninator::Helper
-    
+
     def self.write_aliases(aliases)
       File.open("#{ENV["HOME"]}/.screeninator/scripts/screeninator", 'w') {|f| f.write(aliases.join("\n")) }
     end
-    
+
     def initialize(filename)
       @filename  = filename
       @file_path = "#{root_dir}#{@filename}.yml"
       process_config!
     end
-    
+
     def write!
       if File.exists?(USER_SCREEN_CONFIG)
         template    = USER_SCREEN_CONFIG
@@ -31,24 +31,24 @@ module Screeninator
       start = "screen -c #{config_path} -S #{@project_name}"
       %Q{alias start_#{@filename}='if [[ -n `#{check}` ]] ; then `#{attch}` ; else `#{start}`; fi'}
     end
-    
+
     private
-    
+
     def root_dir
       "#{ENV["HOME"]}/.screeninator/"
     end
-    
+
     def process_config!
       raise ArgumentError.new("#{@file_path} is not valid YAML!")                         unless yaml = YAML.load(File.read(@file_path))
       raise ArgumentError.new("Your configuration file should include some tabs.")        if yaml["tabs"].nil?
       raise ArgumentError.new("Your configuration file didn't specify a 'project_root'")  if yaml["project_root"].nil?
       raise ArgumentError.new("Your configuration file didn't specify a 'project_name'")  if yaml["project_name"].nil?
-      
+
       @escape       = yaml["escape"]
       @project_name = yaml["project_name"]
       @project_root = yaml["project_root"]
       @tabs         = []
-      
+
       yaml["tabs"].each do |tab|
         t = OpenStruct.new
         t.name = tab.keys.first
@@ -60,12 +60,12 @@ module Screeninator
         end
         @tabs << t
       end
-      
+
     end
-    
+
     def write_alias(stuff)
       File.open("#{root_dir}scripts/#{@filename}", 'w') {|f| f.write(stuff) }
     end
   end
-  
+
 end

data/lib/screeninator/helper.rb

@@ -1,8 +1,8 @@
 module Screeninator
   module Helper
-    
+
     help = ["Usage: screeninator ACTION [Args]\n\n"]
-    help << "Available Commans:\n\n"
+    help << "Available Commands:\n\n"
     help << "open CONFIG_NAME".ljust(40)                  + "Open's the config file in $EDITOR.  If it doesn't exist, it will be created."
     help << "copy CONFIG_NAME NEW_CONFIG".ljust(40)       + "Copy an existing config into a new one."
     help << "list".ljust(40)                              + "List all your current config files."
@@ -10,14 +10,14 @@ module Screeninator
     help << "customize [config|template] [delete]".ljust(40)       + "Write your own default YML config or screen template."
     help << "update [CONFIG_NAME, CONFIG_NAME]".ljust(40) + "Recompile all config files.  Helpful if you edit them without using 'screeninator open'."
     help << "implode".ljust(40)                           + "Destroy all configs, compiled configs, and bash scripts."
-    
+
     HELP_TEXT = help.join("\n")
-    
+
     def exit!(msg)
       puts msg
       Kernel.exit(1)
     end
-    
+
     def confirm!(msg)
       puts msg
       if %w(yes Yes YES y).include?(STDIN.gets.chop)
@@ -25,9 +25,9 @@ module Screeninator
       else
         exit! "Aborting."
       end
-      
-      
+
+
     end
-    
+
   end
 end

data/lib/screeninator.rb

@@ -7,5 +7,5 @@ require 'screeninator/config_writer'
 
 module Screeninator
   USER_CONFIG        = "#{ENV["HOME"]}/.screeninator/defaults/default.yml"
-  USER_SCREEN_CONFIG = "#{ENV["HOME"]}/.screeninator/defaults/screen_config.screen"  
+  USER_SCREEN_CONFIG = "#{ENV["HOME"]}/.screeninator/defaults/screen_config.screen"
 end

data/screeninator.gemspec

@@ -46,7 +46,7 @@ UPGRADE WARNING - If you have a custom default config, move it to ~/.screeninato
 Remember to add the following line to your .bashrc file
 
 [[ -s "$HOME/.screeninator/scripts/screeninator" ]] && source "$HOME/.screeninator/scripts/screeninator"
-  
+
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]

metadata

@@ -1,60 +1,66 @@
 --- !ruby/object:Gem::Specification 
 name: screeninator
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
-  version: 1.0.3
+  segments: 
+  - 1
+  - 0
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
-  - Jon Druse
+- Jon Druse
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
-default_executable: screeninator
+date: 2012-04-23 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: shoulda
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: Create and manage complex screen sessions easily.
 email: jon@jondruse.com
 executables: 
-  - screeninator
+- screeninator
 extensions: []
 
 extra_rdoc_files: 
-  - LICENSE
-  - README.md
+- LICENSE
+- README.md
 files: 
-  - .document
-  - CHANGELOG.md
-  - LICENSE
-  - README.md
-  - Rakefile
-  - VERSION
-  - bin/screeninator
-  - lib/screeninator.rb
-  - lib/screeninator/assets/sample.yml
-  - lib/screeninator/assets/screen_config.screen
-  - lib/screeninator/cli.rb
-  - lib/screeninator/config_writer.rb
-  - lib/screeninator/helper.rb
-  - screeninator.gemspec
-  - test/helper.rb
-  - test/test_screeninator.rb
-has_rdoc: true
+- .document
+- CHANGELOG.md
+- LICENSE
+- README.md
+- Rakefile
+- VERSION
+- bin/screeninator
+- lib/screeninator.rb
+- lib/screeninator/assets/sample.yml
+- lib/screeninator/assets/screen_config.screen
+- lib/screeninator/cli.rb
+- lib/screeninator/config_writer.rb
+- lib/screeninator/helper.rb
+- screeninator.gemspec
+- test/helper.rb
+- test/test_screeninator.rb
 homepage: http://github.com/jondruse/screeninator
 licenses: []
 
-post_install_message: |
+post_install_message: |+
   
   Thanks for installing Screeninator!
   
@@ -63,31 +69,35 @@ post_install_message: |
   Remember to add the following line to your .bashrc file
   
   [[ -s "$HOME/.screeninator/scripts/screeninator" ]] && source "$HOME/.screeninator/scripts/screeninator"
-    
-
+  
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Create and manage complex screen sessions easily.
-test_files: 
-  - test/helper.rb
-  - test/test_screeninator.rb
+test_files: []
+