redis_importer 0.0.10 → 0.1.0

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
     rails g redis_importer:install
     
 1. Edit config/redis_importer.yml to set your remote file-storage method and what directory should store local copies of the files during import.
-2. Edit config/s3_config.yml to set your access key, secret access key, bucket name, etc.
+2. Edit config/s3_collection.yml to set your access key, secret access key, bucket name, etc.
 
 **At this time only Amazon S3 is supported as a remote file-storage method.**
 

data/lib/collections/S3_collection.rb

@@ -1,14 +1,11 @@
 class S3Collection
-  def initialize
-    configuration = YAML.load_file(File.open('config/s3_config.yml'))['development']
-    connection = AWS::S3::Base.establish_connection! configuration['connection']
-
-    bucket_name = configuration['bucket']
-    Bucket.create(bucket_name)
-    @bucket = Bucket.find(bucket_name)
-  end
+  include GemConfigurator
   
-  def files
-    @bucket
+  attr_accessor :files
+  def initialize
+    configure
+    connection = AWS::S3::Base.establish_connection! @settings['connection']
+    Bucket.create(@settings['bucket'])
+    self.files = Bucket.find(@settings['bucket'])
   end
 end

data/lib/generators/redis_importer/install/USAGE

@@ -6,4 +6,4 @@ Example:
 
     This will create:
         config/redis_importer.yml
-        config/s3_config.yml
+        config/s3_collection.yml

data/lib/generators/redis_importer/install/install_generator.rb

@@ -6,7 +6,7 @@ module RedisImporter
 
       def generate_collection
         copy_file "redis_importer.example.yml", "config/redis_importer.yml"
-        file_basename = "#{file_storage_type.downcase}_config"
+        file_basename = "#{file_storage_type.downcase}_collection"
         copy_file "#{file_basename}.example.yml", "config/#{file_basename}.yml"
       end
     end

data/lib/redis_importer/redis_importer.rb

@@ -66,8 +66,8 @@ module RedisImporter
     def pipeline
       if !self.commands.empty?
         pipeline = RedisPipeline::RedisPipeline.new
-        pipeline.add_commands(self.commands.flatten)
-        if !pipeline.execute_commands
+        pipeline.add_command(self.commands.flatten)
+        if !pipeline.execute
           add_errors(pipeline.errors)
           false
         else

data/lib/redis_importer/version.rb

@@ -1,3 +1,3 @@
 module RedisImporter
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

data/lib/redis_importer.rb

@@ -1,5 +1,9 @@
 require 'redis_importer/version'
 
+# Requiring unreleased gems
+require 'bundler'
+Bundler.require
+
 # Requiring released gems defined 
 require 'aws/s3'
 require 'gem_configurator'
@@ -7,10 +11,6 @@ require 'csv_to_object'
 require 'redis_pipeline'
 include AWS::S3
 
-# Requiring unreleased gems
-require 'bundler'
-Bundler.require
-
 # Requiring local files
 require 'redis_importer/redis_importer'
 require 'collections/S3_collection'

data/redis_importer.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.version       = RedisImporter::VERSION
 
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency 'redis_backed_model'
-  gem.add_dependency('gem_configurator', '~> 0.0.6')
-  gem.add_dependency('csv_to_object', '~> 0.0.3')
-  gem.add_dependency('redis_pipeline','~> 0.0.5')
+  gem.add_development_dependency('redis_backed_model', '~> 1.0')
+  gem.add_dependency('gem_configurator', '~> 1.1')
+  gem.add_dependency('csv_to_object', '~> 1.0')
+  gem.add_dependency('redis_pipeline','~> 1.0')
   gem.add_dependency('aws-s3', '~> 0.6.3')
 end

data/spec/redis_importer_spec.rb

@@ -6,7 +6,7 @@ describe RedisImporter do
   before(:all) do
     @configuration = YAML.load_file(File.open('config/redis_importer.yml'))['development']
 
-    collection = YAML.load_file(File.open('config/s3_config.yml'))['development']
+    collection = YAML.load_file(File.open('config/s3_collection.yml'))['development']
     connection = AWS::S3::Base.establish_connection! collection['connection']
   
     bucket_name = collection['bucket']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_importer
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000Z
+date: 2012-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152555420 !ruby/object:Gem::Requirement
+  requirement: &2157611140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,54 +22,54 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152555420
+  version_requirements: *2157611140
 - !ruby/object:Gem::Dependency
   name: redis_backed_model
-  requirement: &2152555000 !ruby/object:Gem::Requirement
+  requirement: &2157610640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2152555000
+  version_requirements: *2157610640
 - !ruby/object:Gem::Dependency
   name: gem_configurator
-  requirement: &2152554500 !ruby/object:Gem::Requirement
+  requirement: &2157610140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152554500
+  version_requirements: *2157610140
 - !ruby/object:Gem::Dependency
   name: csv_to_object
-  requirement: &2152554000 !ruby/object:Gem::Requirement
+  requirement: &2164296380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152554000
+  version_requirements: *2164296380
 - !ruby/object:Gem::Dependency
   name: redis_pipeline
-  requirement: &2152553540 !ruby/object:Gem::Requirement
+  requirement: &2164295920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152553540
+  version_requirements: *2164295920
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2152553080 !ruby/object:Gem::Requirement
+  requirement: &2164295460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152553080
+  version_requirements: *2164295460
 description: Creates objects, converts them to Redis commands and executes the redis
   commands.
 email:
@@ -99,7 +99,7 @@ files:
 - lib/generators/redis_importer/install/USAGE
 - lib/generators/redis_importer/install/install_generator.rb
 - lib/generators/redis_importer/install/templates/redis_importer.example.yml
-- lib/generators/redis_importer/install/templates/s3_config.example.yml
+- lib/generators/redis_importer/install/templates/s3_collection.example.yml
 - lib/redis_importer.rb
 - lib/redis_importer/redis_importer.rb
 - lib/redis_importer/version.rb