sconb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77df7796fba683040889ddc87e6d957771618e47
-  data.tar.gz: cc503307d7d92872afe4eaf3875c672803097a65
+  metadata.gz: 633f856637a76bba26ed83506c62ea187aa37b68
+  data.tar.gz: 2953d0670461bd8331d956daa6584215028ca8c4
 SHA512:
-  metadata.gz: 8e0fa3c7eb951ffdf2ed44364017b0485a741d56584244c7ad6d90c5e8b117a4c24c8c1835cecd0c33f6feebb2db7bcbcd907da728157f894dd9506e8f512f87
-  data.tar.gz: b34a700c97f9880abccabc8de7c476deef36ebcc84cfba9dc15614d0181f686c71ea369b0228414ea84d6efcbdf8f4e6db84cd828d3c3eff27718b8b839f3a44
+  metadata.gz: 5d6a82afbe9aa090ccd9ac9844f053dd507c38f9a9ef9366e98c9a8a3855eb0046603a1e5b30f1b5493b8848982d884213b347d28ae1d632444c868e0236b328
+  data.tar.gz: fc8c2c6c76d245e35f25ee655d3a2b90f4ede37894e1c0fb40b6578017cd8e1007c1e9173cd87f4a490d1c43afe5c069ec9da7e96571bbf6d7e67f12812d9a24

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/README.md

@@ -52,12 +52,8 @@ And append github.com config to .ssh/config
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/sconb/fork )
+1. Fork it ( https://github.com/k1LoW/sconb/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`)
 5. Create a new Pull Request
-
-## TODO
-
-- Make test

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
 
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+

data/lib/sconb/version.rb

@@ -1,3 +1,3 @@
 module Sconb
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/sconb.rb

@@ -13,7 +13,10 @@ module Sconb
       path = options[:config]
       file = File.expand_path(path)
       configs = {}
-      return configs unless File.readable?(file)
+      unless File.readable?(file)
+        puts configs 
+        return
+      end
       
       allconfig = config_load(path, '*')
       configs['*'] = allconfig unless allconfig.size == 1
@@ -44,14 +47,11 @@ module Sconb
     
     desc "restore < dump.json > .ssh/config", "Restore .ssh/config from JSON"
     def restore()
-      ssh_config = ''
-      json = ''
-      while str = $stdin.gets
-        json << str
-      end
+      ssh_configs = []
+      json = stdin_read
       configs = JSON.parse(json)
       configs.each do |host, config|
-        ssh_config << "\n"
+        ssh_config = ''
         ssh_config << 'Host ' + host + "\n"
         config.each do |key, value|
           next if key.downcase == 'host' || key.downcase == 'identityfilecontent'
@@ -63,17 +63,15 @@ module Sconb
             ssh_config << '  ' + key + ' ' + value + "\n"
           end
         end
+        ssh_configs.push ssh_config
       end
-      puts ssh_config
+      puts ssh_configs.join("\n")
     end
 
     method_option :force, :type => :boolean, :aliases => '-f', :default => false, :banner => 'force generate'
     desc "keyregen < dump.json", "Regenerate private keys from JSON"
     def keyregen()
-      json = ''
-      while str = $stdin.gets
-        json << str
-      end
+      json = $stdin.read
       configs = JSON.parse(json)
       configs.each do |host, config|
         config.each do |key, value|
@@ -82,7 +80,7 @@ module Sconb
           value.each_with_index do |keycontent,i|
             identity_file = File.expand_path(identity_files[i])
             if File.exists?(identity_file) and !options[:force]
-              raise Thor::Error, "Error: key exists. If you want to overwrite, use --force option."
+              raise Thor::Error, "Error: " + identity_files[i] + " is exists. If you want to overwrite, use --force option."
             end
             puts 'Regenerate ' + identity_files[i] + ' ...'
             File.open(identity_file, 'w') do |file|
@@ -94,7 +92,12 @@ module Sconb
       end
     end
 
-    # Original code Net::SSH::Config.load
+    private
+    def stdin_read()
+      return $stdin.read
+    end
+
+    # Original code is Net::SSH::Config.load (https://github.com/net-ssh/net-ssh/blob/master/LICENSE.txt)
     private
     def config_load(path, host)
       settings = {}
@@ -169,7 +172,7 @@ module Sconb
     end
 
     private
-    # Original code Net::SSH::Config.pattern2regex
+    # Original code is Net::SSH::Config.pattern2regex (https://github.com/net-ssh/net-ssh/blob/master/LICENSE.txt)
     def pattern2regex(pattern)
       pattern = "^" + pattern.to_s.gsub(/\./, "\\.").
         gsub(/\?/, '.').

data/sconb.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "json"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
   spec.add_dependency "thor"  
 end

data/spec/config_test

@@ -0,0 +1,7 @@
+Host github.com
+  User git
+  Port 22
+  Hostname github.com
+  IdentityFile spec/github_rsa
+  TCPKeepAlive yes
+  IdentitiesOnly yes

data/spec/config_test_multi

@@ -0,0 +1,15 @@
+Host github.com
+  User git
+  Port 22
+  Hostname github.com
+  IdentityFile spec/github_rsa
+  TCPKeepAlive yes
+  IdentitiesOnly yes
+
+Host gist
+  User git
+  Port 22
+  Hostname gist.github.com
+  IdentityFile spec/github_rsa
+  TCPKeepAlive yes
+  IdentitiesOnly yes

data/spec/github_rsa

@@ -0,0 +1 @@
+1234567890

data/spec/sconb_spec.rb

@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Sconb do
+  context '`dump` command' do
+
+    it "should convert from .ssh/config to JSON" do
+      expect(capture(:stdout) {
+               Sconb::CLI.new.invoke(:dump, [], {config: File.expand_path('../config_test', __FILE__)})
+             }).to eq <<OUT
+{
+  "github.com": {
+    "Host": "github.com",
+    "User": "git",
+    "Port": "22",
+    "Hostname": "github.com",
+    "IdentityFile": [
+      "spec/github_rsa"
+    ],
+    "TCPKeepAlive": "yes",
+    "IdentitiesOnly": "yes"
+  }
+}
+OUT
+    end
+
+    it "should convert from multi config to JSON" do
+      expect(capture(:stdout) {
+               Sconb::CLI.new.invoke(:dump, [], {config: File.expand_path('../config_test_multi', __FILE__)})
+             }).to eq <<OUT
+{
+  "github.com": {
+    "Host": "github.com",
+    "User": "git",
+    "Port": "22",
+    "Hostname": "github.com",
+    "IdentityFile": [
+      "spec/github_rsa"
+    ],
+    "TCPKeepAlive": "yes",
+    "IdentitiesOnly": "yes"
+  },
+  "gist": {
+    "Host": "gist",
+    "User": "git",
+    "Port": "22",
+    "Hostname": "gist.github.com",
+    "IdentityFile": [
+      "spec/github_rsa"
+    ],
+    "TCPKeepAlive": "yes",
+    "IdentitiesOnly": "yes"
+  }
+}
+OUT
+    end
+
+    it "should convert from .ssh/config to JSON with private keys" do
+      expect(capture(:stdout) {
+               Sconb::CLI.new.invoke(:dump, [], {config: File.expand_path('../config_test', __FILE__), all: true})
+             }).to eq <<OUT
+{
+  "github.com": {
+    "Host": "github.com",
+    "User": "git",
+    "Port": "22",
+    "Hostname": "github.com",
+    "IdentityFile": [
+      "spec/github_rsa"
+    ],
+    "IdentityFileContent": [
+      "1234567890"
+    ],
+    "TCPKeepAlive": "yes",
+    "IdentitiesOnly": "yes"
+  }
+}
+OUT
+    end
+  end
+
+  context '`restore` command' do
+    before do
+      @cli = Sconb::CLI.new
+      allow(@cli).to receive_messages(:stdin_read => <<INN
+{
+  "github.com": {
+    "Host": "github.com",
+    "User": "git",
+    "Port": "22",
+    "Hostname": "github.com",
+    "IdentityFile": [
+      "spec/github_rsa"
+    ],
+    "IdentityFileContent": [
+      "1234567890"
+    ],
+    "TCPKeepAlive": "yes",
+    "IdentitiesOnly": "yes"
+  },
+  "gist": {
+    "Host": "gist",
+    "User": "git",
+    "Port": "22",
+    "Hostname": "gist.github.com",
+    "IdentityFile": [
+      "spec/github_rsa"
+    ],
+    "IdentityFileContent": [
+      "1234567890"
+    ],
+    "TCPKeepAlive": "yes",
+    "IdentitiesOnly": "yes"
+  }
+}
+INN
+)
+    end
+    it "should convert from JSON to config" do
+      expect(capture(:stdout) {
+               @cli.restore
+             }).to eq <<OUT
+Host github.com
+  User git
+  Port 22
+  Hostname github.com
+  IdentityFile spec/github_rsa
+  TCPKeepAlive yes
+  IdentitiesOnly yes
+
+Host gist
+  User git
+  Port 22
+  Hostname gist.github.com
+  IdentityFile spec/github_rsa
+  TCPKeepAlive yes
+  IdentitiesOnly yes
+OUT
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'sconb'
+
+# this method is written by wycats
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new"
+    yield
+    result = eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
+  end
+
+  result
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sconb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,6 +112,11 @@ files:
 - lib/sconb.rb
 - lib/sconb/version.rb
 - sconb.gemspec
+- spec/config_test
+- spec/config_test_multi
+- spec/github_rsa
+- spec/sconb_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -121,4 +141,9 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ssh CONfig Buckup tool.
-test_files: []
+test_files:
+- spec/config_test
+- spec/config_test_multi
+- spec/github_rsa
+- spec/sconb_spec.rb
+- spec/spec_helper.rb