screeninator 0.1.2 → 1.0.1

data/README.md

@@ -103,6 +103,8 @@ Questions? Comments? Feature Request?
 
 I would love to hear your feedback on this project!  Send me a message!
 
+For realtime feedback check out the #screeninator channel on irc.freenode.com
+
 
 Note on Patches/Pull Requests
 -----------------------------

data/VERSION

@@ -1 +1 @@
-0.1.2
+1.0.1

data/bin/screeninator

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
 require 'screeninator'

data/lib/screeninator/cli.rb

@@ -14,6 +14,8 @@ module Screeninator
   class Cli
     
     class << self
+      include Screeninator::Helper
+      
       def start(*args)
 
         if args.empty?
@@ -48,22 +50,16 @@ module Screeninator
         @copy = args.shift
         @name = args.shift
         @config_to_copy = "#{root_dir}#{@copy}.yml"
-        unless File.exists?(@config_to_copy)
-          puts "Project #{@copy} doesn't exist!"
-          Kernel.exit(1)
-        end
+        
+        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)
-          puts "#{@name} already exists, would you like to overwrite it? (type yes or no):"
-          
-          if %w(yes Yes YES).include?(STDIN.gets.chop)
+          confirm!("#{@name} already exists, would you like to overwrite it? (type yes or no):") do
             FileUtils.rm(file_path)
             puts "Overwriting #{@name}"
-          else
-            puts "Aborting."
-            Kernel.exit(0)
           end
           
         end
@@ -76,30 +72,22 @@ module Screeninator
         file_path = "#{root_dir}#{filename}.yml"
         
         if File.exists?(file_path)
-          puts "Are you sure you want to delete #{filename}? (type yes or no):"
-          if %w(yes Yes YES).include?(STDIN.gets.chop)
+          confirm!("Are you sure you want to delete #{filename}? (type yes or no):") do
             FileUtils.rm(file_path)
-            puts "Deleted #{file_path}"
-          else
-            puts "Aborting."
+            puts "Deleted #{filename}"
           end
         else
-          puts "That file doesn't exist."
+          exit! "That file doesn't exist."
         end
         
       end
       
       def implode(*args)
-        puts "delete_all doesn't accapt any arguments!" unless args.empty?
-        puts "Are you sure you want to delete all screeninator configs? (type yes or no):"
-        
-        if %w(yes Yes YES).include?(STDIN.gets.chop)
+        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
           FileUtils.remove_dir(root_dir)
           puts "Deleted #{root_dir}"
-        else
-          puts "Aborting."
         end
-        
       end
 
       def list(*args)
@@ -113,12 +101,12 @@ module Screeninator
       end
       
       def update_scripts
+        Dir["#{root_dir}*.screen"].each {|p| FileUtils.rm(p) }
         aliases = []
         Dir["#{root_dir}*.yml"].each do |path| 
           path = File.basename(path, '.yml')
           aliases << Screeninator::ConfigWriter.new(path).write!
         end
-        
         Screeninator::ConfigWriter.write_aliases(aliases)
       end
       

data/lib/screeninator/config_writer.rb

@@ -2,6 +2,8 @@ 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
@@ -30,12 +32,9 @@ module Screeninator
     def process_config!
       yaml = YAML.load(File.read(@file_path))
 
-      raise "Your configuration file should include some tabs." if yaml["tabs"].nil?
-      puts "Your configuration file didn't specify a 'project_root', using ~/" if yaml["project_root"].nil?
-      if yaml["project_name"].nil?
-        puts "Your configuration file didn't specify a 'project_name', using 'Fluffy Bunnies'"
-        yaml["project_name"] = 'Fluffy Bunnies'
-      end
+      exit!("Your configuration file should include some tabs.")        if yaml["tabs"].nil?
+      exit!("Your configuration file didn't specify a 'project_root'")  if yaml["project_root"].nil?
+      exit!("Your configuration file didn't specify a 'project_name'")  if yaml["project_name"].nil?
       
       @escape       = yaml["escape"]
       @project_name = yaml["project_name"]

data/lib/screeninator/helper.rb

@@ -0,0 +1,21 @@
+module Screeninator
+  module Helper
+    
+    def exit!(msg)
+      puts msg
+      Kernel.exit(1)
+    end
+    
+    def confirm!(msg)
+      puts msg
+      if %w(yes Yes YES y).include?(STDIN.gets.chop)
+        yield
+      else
+        exit! "Aborting."
+      end
+      
+      
+    end
+    
+  end
+end

data/lib/screeninator.rb

@@ -1,8 +1,9 @@
 require 'yaml'
 require 'ostruct'
 require 'erb'
+require 'screeninator/helper'
 require 'screeninator/cli'
 require 'screeninator/config_writer'
 
-module Screeninator
-end
+module Screeninator  
+end

data/screeninator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{screeninator}
-  s.version = "0.1.2"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Druse"]
-  s.date = %q{2010-10-12}
+  s.date = %q{2010-10-29}
   s.default_executable = %q{screeninator}
   s.description = %q{Create and manage complex screen sessions easily.}
   s.email = %q{jon@jondruse.com}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "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"

metadata

@@ -3,10 +3,10 @@ name: screeninator
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+    - 1
     - 0
     - 1
-    - 2
-  version: 0.1.2
+  version: 1.0.1
 platform: ruby
 authors: 
   - Jon Druse
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: screeninator
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
   - 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