glynn 1.0.4 → 1.0.5

data/.rvmrc

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

data/Gemfile

@@ -14,5 +14,6 @@ gem "sdoc-helpers"
 group :test do
 	gem "rspec"
 	gem "mocha"
-	gem "fakefs"
+	gem "fakefs",
+	  :git => 'https://github.com/dmathieu/fakefs.git'
 end

data/Gemfile.lock

@@ -0,0 +1,59 @@
+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/Rakefile

@@ -1,11 +1,4 @@
-begin
-	require File.expand_path('../vendor/environment', __FILE__)
-rescue LoadError
-	require "rubygems"
-	require "bundler"
-	Bundler.setup
-end
-require 'spec/rake/spectask'
+require 'bundler/setup'
 
 begin
   require 'jeweler'
@@ -27,13 +20,10 @@ end
 #
 # The rspec tasks
 #
+require 'rspec/core'
+require 'rspec/core/rake_task'
 task :default => :spec
- 
-desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.spec_opts = ['-cfs']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 #
 # The sdoc generator

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/glynn.gemspec

@@ -1,64 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{glynn}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2011-04-08}
   s.default_executable = %q{glynn}
   s.description = %q{Deploy a jekyll weblog through ftp}
   s.email = %q{42@dmathieu.com}
   s.executables = ["glynn"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "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.rb",
-     "spec/lib/ftp.rb",
-     "spec/lib/jekyll.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".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 = %q{http://github.com/dmathieu/glynn}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.5.1}
   s.summary = %q{Deploy a jekyll weblog through ftp}
   s.test_files = [
-    "spec/lib/file.rb",
-     "spec/lib/ftp.rb",
-     "spec/lib/jekyll.rb",
-     "spec/spec_helper.rb"
+    "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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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/lib/glynn/file.rb

@@ -1,5 +1,3 @@
-require 'ftools'
-
 module Glynn
   class File
     

data/spec/lib/{ftp.rb → ftp_spec.rb}

@@ -12,14 +12,19 @@ describe "FTP Interface" do
   end
   
   it 'should login to ftp server' do
+    @mock.should_receive(:close)
     Net::FTP.should_receive(:new).with('localhost', nil, nil).and_return(@mock)
+    
+    
     Glynn::Ftp.new('localhost').send(:connect) do |ftp|
       ftp.should eql(@mock)
     end
   end
   
   it 'should accept a username and password' do
+    @mock.should_receive(:close)
     Net::FTP.should_receive(:new).with('localhost', 'username', 'password').and_return(@mock)
+    
     Glynn::Ftp.new('localhost', 21, {:username => 'username', :password => 'password'}).send(:connect) do |ftp|
       ftp.should eql(@mock)
     end
@@ -29,10 +34,13 @@ describe "FTP Interface" 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')
-      Dir.mkdir('/test/subdir')
+      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' }
       
@@ -42,6 +50,8 @@ describe "FTP Interface" do
   end
   
   it 'should connect itself to the server and send the local file to distant directory' do
+    @mock.should_receive(:close)
+    
     FakeFS do
       interface = Glynn::Ftp.new('localhost')
       Net::FTP.should_receive(:new).with('localhost', nil, nil).and_return(@mock)

data/spec/spec_helper.rb

@@ -1,15 +1,12 @@
 require 'rubygems'
-require 'spec'
 require 'mocha'
-require 'spec/autorun'
-require 'spec/interop/test'
 require 'fakefs/safe'
 
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'glynn'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
   
 end

metadata

@@ -1,39 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: glynn
-version: !ruby/object:Gem::Version 
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Damien MATHIEU
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-10 00:00:00 +01:00
+date: 2011-04-08 00:00:00.000000000 +02:00
 default_executable: glynn
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &2152256340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152256340
+- !ruby/object:Gem::Dependency
   name: jekyll
+  requirement: &2152255280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152255280
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2152254220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152254220
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &2152253200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *2152253200
+- !ruby/object:Gem::Dependency
+  name: sdoc-helpers
+  requirement: &2152251760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152251760
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: &2152250920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.4
-    version: 
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152250920
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
-executables: 
+executables:
 - glynn
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
-- .gitignore
+files:
+- .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -44,41 +100,41 @@ files:
 - lib/glynn/file.rb
 - lib/glynn/ftp.rb
 - lib/glynn/jekyll.rb
-- spec/lib/file.rb
-- spec/lib/ftp.rb
-- spec/lib/jekyll.rb
+- spec/lib/file_spec.rb
+- spec/lib/ftp_spec.rb
+- spec/lib/jekyll_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/dmathieu/glynn
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -1900938787396399437
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Deploy a jekyll weblog through ftp
-test_files: 
-- spec/lib/file.rb
-- spec/lib/ftp.rb
-- spec/lib/jekyll.rb
+test_files:
+- spec/lib/file_spec.rb
+- spec/lib/ftp_spec.rb
+- spec/lib/jekyll_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,7 +0,0 @@
-_site/*
-pkg/*
-*.kpf
-*.tmproj
-.DS_Store
-vendor/gems/*
-bin/*