poet 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1c22167979b956323e1722622e55dc797f4dd1
-  data.tar.gz: cb6db04649fb4bb6419deda704d8973e48eca4ab
+  metadata.gz: 4fb7070a342cae74fbd9cb0b7c018ffc8537c2cb
+  data.tar.gz: 916e6110ccacfb8e8ec5c9984a5c3cd01266f7fa
 SHA512:
-  metadata.gz: 764a303b1d55051d77222ea392f84d47a147b5142253826d1bdb806c809f22c1e5a65bdb8ac5e16469178a0d17d14e79ff5a7a4a14a6d6260921ef174cece617
-  data.tar.gz: 21780a1d05d1bb5bf1fb7ea86928f76c73d8e25da282acad005c1dc9986364e5bff30a706a2f862d68c72c86c9edcc74456d57e479c546f070b2a0e940315014
+  metadata.gz: d9a3871ae91f7784d750b1760191ec4041b516cd2db37d8747bc14a610559678d3f7b55abc2b5c33dcb9aeaa25d2ec06ed99e17dfc666cbab96d549d432ec832
+  data.tar.gz: 7e20f7e476af2418b350bc153562bd75bff9fe3372e998054c4520f05aced137fd2ba2263dbe90cc0bac1ab4f8277314d79ec8e4e60e1caaab1d7d8df0be7951

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-  - rbx-18mode
-  - jruby
+  - 2.0.0
+  - rbx-19mode
+  - jruby-19mode
 matrix:
   allow_failures:
-    - rvm: jruby
-    - rvm: rbx-18mode
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode

data/History.txt

@@ -1,5 +1,11 @@
 master
 
+- list config files with `poet ls` or `poet ls --tree`
+
+- drop suport for Ruby 1.9.2, officially support 2.0
+
+- `poet edit` re-generates files only when they are actually changed
+
 0.6
 
 - show original file where stanzas came from (thanks @sethiele)

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://secure.travis-ci.org/awendt/poet.png)](http://travis-ci.org/awendt/poet)
+[![Gem Version](https://badge.fury.io/rb/poet.png)](http://badge.fury.io/rb/poet)
 
 # Split your `ssh_config` into separate files!
 
@@ -25,6 +26,8 @@ Every now and then, when you do need it, run `poet --with CONFIG` to explicitly
 `CONFIG.disabled` in your generated ssh_config. You can even include several by running several
 `--with` options or using `--with CONFIG1,CONFIG2`.
 
+Use `poet ls` (or `poet ls --tree`) to see a list (or tree) of all your config files.
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.

data/editors/double_space.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+double_spaced = File.readlines(ARGV.first).join("\n")
+File.write(ARGV.first, double_spaced)

data/features/editing_files.feature

@@ -1,15 +1,4 @@
 Feature: Editing files
-  Scenario: User wants to edit files quickly
-    Given a file named "favorite_editor" with:
-    """
-    Host vim
-      User me
-    """
-    When I set env variable "EDITOR" to "/bin/cat"
-    And I run `poet edit favorite_editor`
-    Then the output from "poet edit favorite_editor" should contain "Host vim"
-    And the file "ssh_config" should contain "Host vim"
-
   Scenario: Show warning when user does not have EDITOR set
     Given a file named "no_editor" with:
     """
@@ -29,4 +18,42 @@ Feature: Editing files
     When I set env variable "EDITOR" to "/bin/cat"
     And I run `poet edit missing -o important`
     Then the output from "poet edit missing -o important" should not contain "Found hand-crafted ssh_config"
-    And the exit status should be 0
+    And the exit status should be 0
+
+  Scenario: ssh_config is re-generated after changing files
+    Given a file named "file1" with:
+    """
+    Host one
+      User me
+    """
+    And the file "ssh_config" should not exist
+
+    When I poet-edit file "file1" and change something
+    Then the exit status should be 0
+    And the file "ssh_config" should contain "Host one"
+
+  Scenario: ssh_config is not re-generated after not changing files
+    Given a file named "file1" with:
+    """
+    Host one
+      User me
+    """
+    And the file "ssh_config" should not exist
+
+    When I poet-edit file "file1" without changing something
+    Then the exit status should be 0
+    And the file "ssh_config" should not exist
+
+  Scenario: ssh_config includes disabled file after editing it
+    Given a file named "homeoffice.disabled" with:
+    """
+    Host normally_disabled
+      User me
+    """
+    When I run `poet`
+    Then the exit status should be 0
+    And the file "ssh_config" should not contain "Host normally_disabled"
+
+    When I poet-edit file "homeoffice.disabled" and change something
+    Then the exit status should be 0
+    And the file "ssh_config" should contain "Host normally_disabled"

data/features/listing_files.feature

@@ -0,0 +1,39 @@
+Feature: Listing files
+
+  Scenario: Listing files without tree
+    Given a directory named "foo/bar"
+    And a file named "foo/bar/conf1" with:
+    """
+    Host one
+    """
+    And a file named "foo/conf2.disabled" with:
+    """
+    Host two
+    """
+    When I run `poet ls`
+    Then the output should contain exactly:
+    """
+    foo/bar/conf1
+    foo/conf2.disabled
+
+    """
+
+  Scenario: Listing files with tree
+    Given a directory named "foo/bar"
+    And a file named "foo/bar/conf1" with:
+    """
+    Host one
+    """
+    And a file named "foo/conf2.disabled" with:
+    """
+    Host two
+    """
+    When I run `poet ls -t`
+    Then the output should contain exactly:
+    """
+    |-- foo
+    |   |-- bar
+    |   |   |-- conf1
+    |   |-- conf2.disabled
+
+    """

data/features/step_definitions/editor_steps.rb

@@ -1,3 +1,13 @@
 When /^I set env variable "(\w+)" to "([^"]*)"$/ do |var, value|
   ENV[var] = value
 end
+
+When /^I poet\-edit file "([^"]*)" and change something$/ do |filename|
+  ENV['EDITOR'] = File.expand_path('../../../editors/double_space.rb', __FILE__)
+  step "I run `poet edit #{filename}`"
+end
+
+When /^I poet\-edit file "([^"]*)" without changing something$/ do |filename|
+  ENV['EDITOR'] = "/bin/cat"
+  step "I run `poet edit #{filename}`"
+end

data/lib/poet.rb

@@ -6,6 +6,8 @@ class PoetCLI < Thor
 
   MAGIC_LINE = "# Generated by #{File.basename(__FILE__, '.rb')}"
 
+  attr_accessor :files_to_include
+
   default_task :create
   class_option :dir,
       desc: 'Use specified directory to collect conf files',
@@ -23,6 +25,18 @@ class PoetCLI < Thor
       aliases: '-v',
       type: :boolean
 
+  no_tasks do
+    def print_tree(dir = ".", nesting = 0)
+      Dir.entries(dir).sort.each do |entry|
+        next if entry =~ /^\.{1,2}/   # Ignore ".", "..", or hidden files
+        puts "|   " * nesting + "|-- #{entry}"
+        if File.stat(d = "#{dir}#{File::SEPARATOR}#{entry}").directory?
+          print_tree(d, nesting + 1)
+        end
+      end
+    end
+  end
+
   desc "bootstrap [FILE]",
       "Move ~/.ssh/config (or whatever you specified) to ~/.ssh/config.d/ to help you get started"
   def bootstrap(file=nil)
@@ -50,10 +64,10 @@ class PoetCLI < Thor
       Process.exit!(2)
     end
 
-    whitelist = options[:with].split(',')
+    whitelist = files_to_include || options[:with].split(',').map{|file| "#{file}.disabled"}
     files = Dir["#{options[:dir]}/**/*"].reject do |file|
       File.directory?(file) || \
-        file =~ /\.disabled$/ && !whitelist.include?("#{File.basename(file, '.disabled')}")
+        file =~ /\.disabled$/ && !whitelist.include?(File.basename(file))
     end
 
     files -= [options[:output]]
@@ -81,8 +95,20 @@ class PoetCLI < Thor
       Process.exit!(4)
     end
     filepath = File.join(options[:dir], file)
+    checksum_before = Digest::MD5.file(filepath) rescue '0'*16
     system("#{ENV['EDITOR']} #{filepath}")
-    create if File.exists?(filepath)
+    self.files_to_include = [file]
+    create if File.exists?(filepath) && checksum_before != Digest::MD5.file(filepath)
   end
 
-end
+  desc "ls", "List all configuration files"
+  option :tree, aliases: '-t', type: :boolean, desc: 'Print tree of config dir'
+  def ls
+    if options[:tree]
+      print_tree(options[:dir])
+    else
+      files = Dir["#{options[:dir]}/**/*"].sort.reject { |file| File.directory?(file) }
+      puts files.map{|filename| filename[options[:dir].size+1..-1]}.join("\n")
+    end
+  end
+end

data/lib/poet/version.rb

@@ -1,3 +1,3 @@
 module Poet
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

data/poet.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "poet"
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features,editors}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poet
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - André Wendt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -83,8 +83,10 @@ files:
 - README.md
 - Rakefile
 - bin/poet
+- editors/double_space.rb
 - features/bootstrapping.feature
 - features/editing_files.feature
+- features/listing_files.feature
 - features/permissions.feature
 - features/running.feature
 - features/selective_files.feature
@@ -119,8 +121,10 @@ signing_key:
 specification_version: 4
 summary: Poet concatenates stanzas
 test_files:
+- editors/double_space.rb
 - features/bootstrapping.feature
 - features/editing_files.feature
+- features/listing_files.feature
 - features/permissions.feature
 - features/running.feature
 - features/selective_files.feature