piedesaint 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a67bed518cb262ac669a97ad0283f805e2b12bc
-  data.tar.gz: d0d02fbacbd4ee1bf4f8065d3231136e8571c848
+  metadata.gz: cd5187dd62378f733ea9756d5c7e6acbfca1683b
+  data.tar.gz: a2e52298d82e0e6bcaf2b9e7bd8ba14d298588b8
 SHA512:
-  metadata.gz: 4d7f48a002c02e4ccd3a703890a576482e69ad1d1513a42a3e40df1c93b2fae3ea999df7bf5cb934a1be5fbf576ec2c6ea9119a53ff3b12ac9184a8c8f153c3a
-  data.tar.gz: 67f31bf0a390ed4e4213ca9a720d8dd0214618b195a6a45529a4bc7fa8473fc7497c6cb0cdf95e7face5523e8dd17426f8813aec8ceda6033cf0cfed9ce084d6
+  metadata.gz: 4292e4a783972de57f212e20d46f5c31e29cbc21fc53e91da8ac81d0a4dbad0cd4ccfed05ff2ea74c141728a00cdb0ed187f83becbd60f2bfb938ae53907231c
+  data.tar.gz: ce9f94adb7f0af65c5c8767eefdf928d1ef87be604168915771679f1058bc61997b1a7d8df60a7ccaa9f25f8cf0006141897e4415b00b2ee6fba3b1436629b06

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1

data/README.md

@@ -8,15 +8,15 @@
 
 ## In short
 
-[Piedesaint](https://github.com/tnarik/piedesaint) is a minimal web server designed to expose directly files and directories (in [TAR](http://en.wikipedia.org/wiki/Tar_(computing) format) via HTTP or HTTPS.
+[Piedesaint](https://github.com/tnarik/piedesaint) is a minimal web server designed to expose directly files and directories (in [TAR](http://en.wikipedia.org/wiki/Tar_(computing) format for convenience) via HTTP or HTTPS.
 
 ## Motivation
 
-It was born from the need of having the simplest web server possible (while still being reasonably fast and secure) to provide files and directories to be used by [remote_file](http://docs.opscode.com/resource_remote_file.html) Chef resources, solving the issue of distributing packages that for different reasons are not public or require some interaction to get downloaded, without requiring the installation of a full fledged web server.
+It was born out of the need of having the simplest web server possible (while still being reasonably fast and secure) to provide files and directories to be used by [remote_file](http://docs.opscode.com/resource_remote_file.html) Chef resources, solving the issue of distributing packages that for different reasons might not be public or require some interaction to get downloaded, without requiring the installation of a full fledged web server.
 
-It also serves directories (packaging them on the fly) as a single resource.
+It also serves directories (packaging them on the fly) as a single TAR resource.
 
-This is useful in the case of using chef-solo (combined with Vagrant, for instance, for testing) when database backups or internal git repositories or installation packages need to be transported to the client node but adding those packages to our cookbooks is not wanted or possible.
+This is useful in the case of using chef-zero (combined with Vagrant or Test Kitchen, for instance) when database backups/internal git repositories/installation packages need to be transported to the client node but adding those packages to our cookbooks is not desired or possible.
 
 ## Installation
 
@@ -38,7 +38,7 @@ After installation you will need to initialize the configuration by executing:
 	
 	$ sug init [list of folders to serve, in cascade order]
 
-This creates the ```.piedesaint``` folder that you can inspect and configure (it contains a default shortlived SSL key/certificate pair and some additional configuration in [YAML](http://en.wikipedia.org/wiki/YAML) format).
+This creates the `.piedesaint` folder that you can inspect and configure (it contains a default shortlived and self-signed SSL key/certificate pair and some additional configuration in [YAML](http://en.wikipedia.org/wiki/YAML) format).
 
 By default the configuration will serve the current directory, unless a list of folders is specified. If you want to serve a different folder or set of folders, just edit the configuration.
 
@@ -46,7 +46,7 @@ After this, whenever you want to serve the files/directories, just execute:
 
 	$ sug
 
-Alternatively, by editing ```.piedesaint/config```, you can disable compressed folders (```:tar: false```) and the need for Basic Authorization credentials (using an empty ```:username:```).
+Alternatively, by editing `.piedesaint/config`, you can disable compressed folders (`:tar: false`), the need for Basic Authorization credentials (using an empty `:username:`) or the SSL behaviour (using an empty `:key:`).
 
 ## License
 

data/bin/sug

@@ -5,4 +5,4 @@ require 'piedesaint/cli'
 
 cli = Piedesaint::CLI.new
 cli.execute if ARGV.length == 0
-cli.send ARGV.shift, ARGV if ARGV.length >= 1
+cli.public_send ARGV.shift, ARGV if ARGV.length >= 1

data/lib/piedesaint.rb

@@ -120,14 +120,14 @@ module Piedesaint
     #ctx.cert = "./server.crt"
     #ctx.verify_mode = ::Puma::MiniSSL::VERIFY_NONE
 
-    puma.add_tcp_listener options[:host], options[:http_port]
+    puma.add_tcp_listener options[:iface], options[:http_port]
 
     if ( !options[:key].nil? and !options[:key].empty? )
       ctx = ::OpenSSL::SSL::SSLContext.new
       ctx.key = OpenSSL::PKey::RSA.new File.read(options[:key])
       ctx.cert = OpenSSL::X509::Certificate.new File.read(options[:cert])
       ctx.verify_mode = ::OpenSSL::SSL::VERIFY_NONE
-      puma.add_ssl_listener options[:host], options[:https_port], ctx
+      puma.add_ssl_listener options[:iface], options[:https_port], ctx
     end
 
     puma.min_threads = 1

data/lib/piedesaint/cli.rb

@@ -14,6 +14,7 @@ module Piedesaint
 
     def execute
       load_config
+      cert(@config[:host]) if @config[:refresh_cert]
       piedesanto = Piedesaint.new @config
       piedesanto.start
     end
@@ -22,37 +23,52 @@ module Piedesaint
       if File.exist?(".piedesaint")
         abort "Configuration already exists at #{Dir.pwd}/.piedesaint"
       end
-      key, cert = create_ssl_artifacts
 
-      FileUtils.mkdir_p ".piedesaint"
-      FileUtils.cd ".piedesaint" do
-        FileUtils.mkdir_p "ssl"
-        FileUtils.cd "ssl" do
-          open 'server.key', 'w' do |io| io.write key.to_pem end
-          open 'server.crt', 'w' do |io| io.write cert.to_pem end
-        end
+      config = { iface: "0.0.0.0",
+                  http_port: 8080,
+                  https_port: 9292,
+                  refresh_cert: true,
+                  host: "localhost",
+                  key: File.join(".", ".piedesaint", "ssl", "server.key" ),
+                  cert: File.join(".", ".piedesaint", "ssl", "server.crt" ),
+                  username: "user",
+                  password: "password",
+                  freshness: 3600,
+                  metastore: 'file:/tmp/rack/meta',
+                  entitystore: 'file:/tmp/rack/body',
+                  tar: true,
+                  folders: parameters }
+      save_config config
+      cert
+      puts "Configuration created at #{Dir.pwd}/.piedesaint"
+    end
 
-        config = { host: "0.0.0.0",
-                    http_port: 8080,
-                    https_port: 9292,
-                    key: File.join(".", ".piedesaint", "ssl", "server.key" ),
-                    cert: File.join(".", ".piedesaint", "ssl", "server.crt" ),
-                    username: "user",
-                    password: "password",
-                    freshness: 3600,
-                    metastore: 'file:/tmp/rack/meta',
-                    entitystore: 'file:/tmp/rack/body',
-                    tar: true,
-                    folders: parameters }
+    def set_host ( host = [] )
+      load_config
+      @config[:host] = host[0]
+      save_config @config
+      cert host[0]
+    end
 
-        open 'config', 'w' do |io| io.write config.to_yaml end
+    private
+    def load_config
+      config_path = find_default_config_path
+      if config_path.nil?
+        abort "Configuration not provided.\nExecute '#{$PROGRAM_NAME} init' to generate one"
       end
 
-      puts "Configuration created at #{Dir.pwd}/.piedesaint"
+      @config = YAML.load_file File.join(config_path, "config")
     end
 
-    def cert ( cert_subject = 'CN=Piedesaint' )
-      key, cert = create_ssl_artifacts
+    def save_config ( config )
+      FileUtils.mkdir_p ".piedesaint"
+      FileUtils.cd ".piedesaint" do
+        open 'config', 'w' do |io| io.write config.to_yaml end
+      end
+    end
+
+    def cert ( cn = 'localhost' )
+      key, cert = create_ssl_artifacts cn
 
       FileUtils.mkdir_p ".piedesaint"
       FileUtils.cd ".piedesaint" do
@@ -64,17 +80,7 @@ module Piedesaint
       end
     end
 
-    private
-    def load_config
-      config_path = find_default_config_path
-      if config_path.nil?
-        abort "Configuration not provided.\nExecute '#{$PROGRAM_NAME} init' to generate one"
-      end
-
-      @config = YAML.load_file File.join(config_path, "config")
-    end
-
-    def create_ssl_artifacts ( cert_subject = 'CN=Piedesaint' )
+    def create_ssl_artifacts ( cn = 'localhost' )
       key = OpenSSL::PKey::RSA.new 2048
 
       cert = OpenSSL::X509::Certificate.new
@@ -83,7 +89,7 @@ module Piedesaint
       cert.not_before = Time.now
       cert.not_after = Time.now + 3 * 3600
       cert.public_key = key.public_key
-      name = OpenSSL::X509::Name.parse cert_subject
+      name = OpenSSL::X509::Name.parse "CN=#{cn}"
       cert.subject = name
       cert.issuer = name
       cert.sign key, OpenSSL::Digest::SHA1.new

data/lib/piedesaint/version.rb

@@ -1,3 +1,3 @@
 module Piedesaint
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/piedesaint.gemspec

@@ -23,8 +23,8 @@ EOF
   spec.require_paths = ["lib"]
 
   # development dependencies
-  spec.add_development_dependency "thor"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
 
   # runtime dependencies
   spec.add_dependency "puma", "~>1.6.3"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: piedesaint
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tnarik Innael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -103,7 +104,6 @@ files:
 - lib/piedesaint/cli.rb
 - lib/piedesaint/version.rb
 - piedesaint.gemspec
-- tasks/gem.thor
 homepage: https://github.com/tnarik/piedesaint
 licenses:
 - MIT

data/tasks/gem.thor

@@ -1,33 +0,0 @@
-class Gem < Thor  
-    include Thor::Actions
-
-    # This allows for dynamic descriptions
-    begin
-        @gemhelper = Bundler::GemHelper.new
-    rescue
-    end
-
-    def initialize(*args)
-        super
-        @gemhelper = Bundler::GemHelper.new
-    end
-
-    # tasks
-    desc "build", @gemhelper.nil? ? "Building gem into the pkg directory" : 
-                        "Building #{@gemhelper.gemspec.name}-#{@gemhelper.gemspec.version}.gem into the pkg directory"
-    def build
-        @gemhelper.build_gem
-    end
-
-    desc "install", @gemhelper.nil? ? "Build and install gem into system gems" : 
-                        "Build and install #{@gemhelper.gemspec.name}-#{@gemhelper.gemspec.version}.gem into system gems"
-    def install
-        @gemhelper.install_gem
-    end
-
-    desc "release", @gemhelper.nil? ? "Create tag and build and push gem to Rubygems" :
-                        "Create tag v#{@gemhelper.gemspec.version} and build and push #{@gemhelper.gemspec.name}-#{@gemhelper.gemspec.version}.gem to Rubygems"
-    def release
-        @gemhelper.release_gem
-    end
-end