glynn 1.0.9 → 1.0.10

data/lib/glynn/ftp.rb

@@ -19,6 +19,7 @@ module Glynn
     private
     def connect
       Net::FTP.open(host) do |ftp|
+        ftp.passive = true
         ftp.connect(host, port)
         ftp.login(username, password)
         yield ftp

data/lib/glynn/version.rb

@@ -0,0 +1,3 @@
+module Glynn
+  VERSION = '1.0.10'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,102 +9,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-05-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &70171743230860 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &70114419072340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70171743230860
-- !ruby/object:Gem::Dependency
-  name: jekyll
-  requirement: &70171743230160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70171743230160
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70171743229540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70171743229540
-- !ruby/object:Gem::Dependency
-  name: sdoc
-  requirement: &70171743228960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70171743228960
+  version_requirements: *70114419072340
 - !ruby/object:Gem::Dependency
-  name: sdoc-helpers
-  requirement: &70171743228320 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &70114419105440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70171743228320
+  version_requirements: *70114419105440
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70171743227780 !ruby/object:Gem::Requirement
+  requirement: &70114419104920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171743227780
+  version_requirements: *70114419104920
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
-executables:
-- glynn
+executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
-- .rvmrc
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile
-- VERSION
-- bin/glynn
-- glynn.gemspec
 - lib/glynn.rb
 - lib/glynn/file.rb
 - lib/glynn/ftp.rb
 - lib/glynn/jekyll.rb
-- spec/lib/file_spec.rb
-- spec/lib/ftp_spec.rb
-- spec/lib/jekyll_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-homepage: http://github.com/dmathieu/glynn
+- lib/glynn/version.rb
+homepage: https://github.com/dmathieu/glynn
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -116,9 +67,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3112693191030928112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,12 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Deploy a jekyll weblog through ftp
-test_files:
-- spec/lib/file_spec.rb
-- spec/lib/ftp_spec.rb
-- spec/lib/jekyll_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm use 1.9.2@glynn
-rvm_gemset_create_on_use_flag=1

data/Gemfile

@@ -1,19 +0,0 @@
-source "http://gemcutter.org"
-#
-# Required on every environment
-#
-gem "rdiscount"
-gem "jekyll"
-gem "jeweler"
-gem "sdoc"
-gem "sdoc-helpers"
-
-#
-# Required only for tests
-#
-group :test do
-  gem "rspec"
-  gem "mocha"
-  gem "fakefs",
-    :git => 'https://github.com/dmathieu/fakefs.git'
-end

data/Gemfile.lock

@@ -1,59 +0,0 @@
-GIT
-  remote: https://github.com/dmathieu/fakefs.git
-  revision: 09f238b23772d95e8790235b7d3eee99e431deac
-  specs:
-    fakefs (0.3.1)
-
-GEM
-  remote: http://gemcutter.org/
-  specs:
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
-    diff-lcs (1.1.2)
-    directory_watcher (1.4.0)
-    fast-stemmer (1.0.0)
-    git (1.2.5)
-    jekyll (0.10.0)
-      classifier (>= 1.3.1)
-      directory_watcher (>= 1.1.1)
-      liquid (>= 1.9.0)
-      maruku (>= 0.5.9)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json (1.5.1)
-    liquid (2.2.2)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    mocha (0.9.12)
-    rake (0.8.7)
-    rdiscount (1.6.8)
-    rdoc (2.4.3)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sdoc (0.2.20)
-      json (>= 1.1.3)
-      rdoc (= 2.4.3)
-    sdoc-helpers (0.1.4)
-      sdoc (~> 0.2)
-    syntax (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fakefs!
-  jekyll
-  jeweler
-  mocha
-  rdiscount
-  rspec
-  sdoc
-  sdoc-helpers

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Damien MATHIEU
- 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,48 +0,0 @@
-Glynn
-=====
-
-Glynn offers you a bin to easily send a jekyll powered blog to your host through FTP.  
-[![Travis](http://travis-ci.org/dmathieu/glynn.png)](http://travis-ci.org/dmathieu/glynn)
-
-Installation
-------------
-
-Glynn comes as a gem. It has no dependencies other than the ruby default libraries.
-Install it with gem install.
-
-    gem install glynn --source http://gemcutter.org
-
-That's it ! You now have the Glynn executable on your machine.
-Go to your jekyll project, configure the host and distant directory where the files will be sent.
-For example, this is my _config.yml file :
-
-    markdown: rdiscount
-    pygments: true
-    auto: true
-    ftp_host: dmathieu.com
-    ftp_dir: /web/portfolio
-
-Glynn will connect itself to the host "dmathieu.com" and send every file to the FTP directory /web/portfolio.
-To do yo, you just need to be at the top of your jekyll project. And in a console, enter the following :
-
-    glynn
-
-Quite simple again. It'll connect to the remote host, ask you for login and password and send the files :)
-
-Contributing
-------------
-
-If you think Glynn is great but can be improved, feel free to contribute.
-To do so, you can :
-
-* [Fork](http://help.github.com/forking/) the project
-* Do your changes and commit them to your repository
-* Test your changes. We won't accept any untested contributions (except if they're not testable).
-* Create an [issue](http://github.com/dmathieu/glynn/issues) with a link to your commits.
-
-And that's it! I'll soon take a look at your issue and review your changes.
-
-Author
-------------------
-
-Damien MATHIEU :: 42 (AT|CHEZ) dmathieu.com

data/Rakefile

@@ -1,35 +0,0 @@
-require 'bundler/setup'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "glynn"
-    gemspec.summary = "Deploy a jekyll weblog through ftp"
-    gemspec.description = "Deploy a jekyll weblog through ftp"
-    gemspec.email = "42@dmathieu.com"
-    gemspec.homepage = "http://github.com/dmathieu/glynn"
-    gemspec.authors = ["Damien MATHIEU"]
-
-    gemspec.add_dependency('jekyll', '>= 0.5.4')
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with:"
-  puts "gem install jeweler"
-end
-
-#
-# The rspec tasks
-#
-require 'rspec/core'
-require 'rspec/core/rake_task'
-task :default => :spec
-RSpec::Core::RakeTask.new(:spec)
-
-#
-# The sdoc generator
-#
-begin
-  require 'sdoc_helpers'
-rescue LoadError
-  puts "sdoc support not enabled. Please gem install sdoc-helpers."
-end

data/VERSION

@@ -1 +0,0 @@
-1.0.9

data/bin/glynn

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'jekyll'
-require 'glynn'
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-
-options = {}
-case ARGV.size
-  when 0
-  when 1
-    options['destination'] = ARGV[0]
-  when 2
-    options['source'] = ARGV[0]
-    options['destination'] = ARGV[1]
-  when 4
-    options['source'] = ARGV[0]
-    options['destination'] = ARGV[1]
-    options['ftp_username'] = ARGV[2]
-    options['ftp_password'] = ARGV[3]
-end
-options = Jekyll.configuration(options)
-ftp_port = (options['ftp_port'] || 21).to_i
-
-puts "Building site: #{options['source']} -> #{options['destination']}"
-jekyll = Glynn::Jekyll.new
-jekyll.build
-puts "Successfully generated site"
-
-puts "Sending site over FTP (host: #{options['ftp_host']}, port: #{ftp_port})"
-begin
-  if options['ftp_username'].nil?
-    print "FTP Username: "
-    username = $stdin.gets.chomp
-  else
-    username = options['ftp_username']
-  end
-
-  if options['ftp_password'].nil?
-    print "FTP Password: "
-    # We hide the entered characters before to ask for the password
-    system "stty -echo"
-    password = $stdin.gets.chomp
-    system "stty echo"
-  else
-    password = options['ftp_password']
-  end
-rescue NoMethodError, Interrupt
-  # When the process is exited, we display the characters again
-  # And we exit
-  system "stty echo"
-  exit
-end
-
-ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {:username => username, :password => password})
-puts "\r\nConnected to server. Sending site"
-ftp.sync(options['destination'], options['ftp_dir'])
-puts "Successfully sent site"

data/glynn.gemspec

@@ -1,78 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "glynn"
-  s.version = "1.0.9"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Damien MATHIEU"]
-  s.date = "2012-01-31"
-  s.description = "Deploy a jekyll weblog through ftp"
-  s.email = "42@dmathieu.com"
-  s.executables = ["glynn"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/glynn",
-    "glynn.gemspec",
-    "lib/glynn.rb",
-    "lib/glynn/file.rb",
-    "lib/glynn/ftp.rb",
-    "lib/glynn/jekyll.rb",
-    "spec/lib/file_spec.rb",
-    "spec/lib/ftp_spec.rb",
-    "spec/lib/jekyll_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/dmathieu/glynn"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Deploy a jekyll weblog through ftp"
-  s.test_files = [
-    "spec/lib/file_spec.rb",
-    "spec/lib/ftp_spec.rb",
-    "spec/lib/jekyll_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
-      s.add_runtime_dependency(%q<jekyll>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<sdoc>, [">= 0"])
-      s.add_runtime_dependency(%q<sdoc-helpers>, [">= 0"])
-      s.add_runtime_dependency(%q<jekyll>, [">= 0.5.4"])
-    else
-      s.add_dependency(%q<rdiscount>, [">= 0"])
-      s.add_dependency(%q<jekyll>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
-      s.add_dependency(%q<sdoc-helpers>, [">= 0"])
-      s.add_dependency(%q<jekyll>, [">= 0.5.4"])
-    end
-  else
-    s.add_dependency(%q<rdiscount>, [">= 0"])
-    s.add_dependency(%q<jekyll>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
-    s.add_dependency(%q<sdoc-helpers>, [">= 0"])
-    s.add_dependency(%q<jekyll>, [">= 0.5.4"])
-  end
-end
-

data/spec/lib/file_spec.rb

@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "File module" do
-  before(:all) do
-    FakeFS.activate!
-  end
-  after(:all) do
-    FakeFS.deactivate!
-  end
-
-  it "should return file is text" do
-    File.open('/test/README', 'w') { |f| f.write 'N/A' }
-    Glynn::File.is_bin?('/test/README').should eql(true)
-  end
-
-  it "should return file is binary" do
-    File.open('/test/README', 'w') { |f| f.write ['0', '1', '2', '3'].pack('A3A3A3') }
-    Glynn::File.is_bin?('/test/README').should eql(true)
-  end
-end

data/spec/lib/ftp_spec.rb

@@ -1,79 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "FTP Interface" do
-  before(:each) do
-    # We mock the FTP server
-    @mock = mock('Ftp server').as_null_object
-
-    # And the puttextfile method
-    class Net::FTP
-      def puttextfile; true; end
-    end
-  end
-
-  it 'should connect to ftp server' do
-    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
-
-    Glynn::Ftp.new('localhost').send(:connect) do |ftp|
-      ftp.should eql(@mock)
-    end
-  end
-
-  it 'should login to ftp server' do
-    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
-
-    Glynn::Ftp.new('localhost').send(:connect) do |ftp|
-      @mock.should_receive(:login).with(nil, nil)
-    end
-  end
-
-  it 'should use the given port' do
-    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
-
-    Glynn::Ftp.new('localhost', 1234).send(:connect) do |ftp|
-      @mock.should_receive(:connect).with('localhost', 1234)
-      ftp.should eql(@mock)
-    end
-  end
-
-  it 'should accept a username and password' do
-    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
-
-    Glynn::Ftp.new('localhost', 21, {:username => 'username', :password => 'password'}).send(:connect) do |ftp|
-      @mock.should_receive(:login).with('username', 'password')
-      ftp.should eql(@mock)
-    end
-  end
-
-  it 'should recursively send a directory' do
-    # We expect NET/FTP to create every file
-    @mock.should_receive(:putbinaryfile).with('/test/README', '/blah/README').and_return(true)
-    @mock.should_receive(:putbinaryfile).with('/test/subdir/README', '/blah/subdir/README').and_return(true)
-    @mock.should_receive(:mkdir).with('/blah')
-    @mock.should_receive(:mkdir).with('/blah/subdir').twice
-
-    FakeFS do
-      # We create the fake files and directories
-      Dir.mkdir('/test') unless File.exists?('/test')
-      Dir.mkdir('/test/subdir') unless File.exists?('/test')
-      File.open('/test/README', 'w') { |f| f.write 'N/A' }
-      File.open('/test/subdir/README', 'w') { |f| f.write 'N/A' }
-
-      # And send them
-      Glynn::Ftp.new('localhost').send(:send_dir, @mock, '/test', '/blah')
-    end
-  end
-
-  it 'should connect itself to the server and send the local file to distant directory' do
-    FakeFS do
-      Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
-      interface = Glynn::Ftp.new('localhost') do |ftp|
-        @mock.should_receive(:connect).with('localhost', 21)
-        @mock.should_receive(:login).with(nil, nil)
-        interface.should_receive(:send_dir).with(@mock, '/test', '/blah')
-      end
-
-      interface.sync '/test', '/blah'
-    end
-  end
-end

data/spec/lib/jekyll_spec.rb

@@ -1,28 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "Relation between glynn and jekyll" do
-  before(:all) do
-    FakeFS.activate!
-    File.open('/_config.yml', 'w') { |f| f.write 'auto: true' }
-  end
-  after(:all) do
-    FakeFS.deactivate!
-  end
-
-  it 'should create a new website' do
-    jekyll = Glynn::Jekyll.new({ 'source' => '/' })
-    jekyll.build
-  end
-
-  it 'should accept the ftp host option' do
-    File.open('/_config.yml', 'w') { |f| f.write 'ftp_host: example.com' }
-    options = Jekyll.configuration({'source' => '/'})
-    options['ftp_host'].should eql('example.com')
-  end
-
-  it 'should accept the fto dir option' do
-    File.open('/_config.yml', 'w') { |f| f.write 'ftp_dir: /home/glynn' }
-    options = Jekyll.configuration({'source' => '/'})
-    options['ftp_dir'].should eql('/home/glynn')
-  end
-end

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'mocha'
-require 'fakefs/safe'
-
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'glynn'