glynn 1.0.2 → 1.0.3

data/Gemfile

@@ -2,7 +2,9 @@ source "http://gemcutter.org"
 #
 # Required on every environment
 #
+gem "rdiscount"
 gem "jekyll"
+gem "jeweler"
 gem "sdoc"
 gem "sdoc-helpers"
 

data/Rakefile

@@ -1,4 +1,10 @@
-require 'vendor/gems/environment'
+begin
+	require File.expand_path('../vendor/environment', __FILE__)
+rescue LoadError
+	require "rubygems"
+	require "bundler"
+	Bundler.setup
+end
 require 'spec/rake/spectask'
 
 begin

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/bin/glynn

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'jekyll'
-require 'glynn'
+begin
+	require File.expand_path('../vendor/environment', __FILE__)
+rescue LoadError
+	require "rubygems"
+	require "bundler"
+	Bundler.setup
+end
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 
@@ -13,6 +17,11 @@ case ARGV.size
   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)
 
@@ -28,17 +37,17 @@ begin
     print "FTP Username: "
     username = $stdin.gets.chomp
   else
-    username = options['username']
+    username = options['ftp_username']
   end
   
-  if options['password'].nil?
+  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['password']
+    password = options['ftp_password']
   end
 rescue NoMethodError, Interrupt
   # When the process is exited, we display the characters again
@@ -50,4 +59,4 @@ end
 ftp = Glynn::Ftp.new(options['ftp_host'], 21, {:username => username, :password => password})
 puts "\r\nConnected to server. Sending site"
 ftp.sync(options['destination'], options['ftp_dir'])
-puts "Successfully sent site"
+puts "Successfully sent site"

data/glynn.gemspec

@@ -1,18 +1,19 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{glynn}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-02-08}
+  s.default_executable = %q{glynn}
   s.description = %q{Deploy a jekyll weblog through ftp}
   s.email = %q{42@dmathieu.com}
-  s.executables = ["autospec", "glynn", "jekyll", "maruku", "marutex", "rake", "redcloth", "spec"]
+  s.executables = ["glynn"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.md"
@@ -36,11 +37,10 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/dmathieu/glynn}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Deploy a jekyll weblog through ftp}
   s.test_files = [
     "spec/lib/file.rb",
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<jekyll>, [">= 0.5.4"])
@@ -62,3 +62,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jekyll>, [">= 0.5.4"])
   end
 end
+

data/spec/lib/ftp.rb

@@ -27,8 +27,8 @@ describe "FTP Interface" do
   
   it 'should recursively send a directory' do
     # We expect NET/FTP to create every file
-    @mock.should_receive(:puttextfile).with('/test/README', '/blah/README').and_return(true)
-    @mock.should_receive(:puttextfile).with('/test/subdir/README', '/blah/subdir/README').and_return(true)
+    @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)
     FakeFS do
       # We create the fake files and directories
       Dir.mkdir('/test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: glynn
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Damien MATHIEU
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 +01:00
-default_executable: 
+date: 2010-02-08 00:00:00 +01:00
+default_executable: glynn
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll
@@ -25,14 +25,7 @@ dependencies:
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
 executables: 
-- autospec
 - glynn
-- jekyll
-- maruku
-- marutex
-- rake
-- redcloth
-- spec
 extensions: []
 
 extra_rdoc_files: 
@@ -58,6 +51,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/dmathieu/glynn
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -78,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Deploy a jekyll weblog through ftp
 test_files: 
 - spec/lib/file.rb

data/bin/autospec

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rspec-1.3.0/bin/autospec")

data/bin/jekyll

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/jekyll-0.5.6/bin/jekyll")

data/bin/maruku

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/maruku-0.6.0/bin/maruku")

data/bin/marutex

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/maruku-0.6.0/bin/marutex")

data/bin/rake

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rake-0.8.7/bin/rake")

data/bin/redcloth

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/RedCloth-4.2.2/bin/redcloth")

data/bin/spec

@@ -1,3 +0,0 @@
-#!/opt/local/bin/ruby
-require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
-load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rspec-1.3.0/bin/spec")