right_scraper 3.2.6 → 5.0.1

data/lib/right_scraper/scrapers/cookbook.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright: Copyright (c) 2010-2011 RightScale, Inc.
+# Copyright: Copyright (c) 2010-2013 RightScale, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,53 +21,55 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+# ancestor
+require 'right_scraper/scrapers'
 
-module RightScraper
-  module Scrapers
+module RightScraper::Scrapers
 
-    # Chef cookbook scraper
-    class Cookbook < Base
+  # Chef cookbook scraper
+  class Cookbook < ::RightScraper::Scrapers::Base
+    COOKBOOK_SENTINELS = ['metadata.json', 'metadata.rb']
 
-      # Find the next cookbook, starting in dir.
-      #
-      # === Parameters
-      # dir(Dir):: directory to begin search in
-      def find_next(dir)
-        @logger.operation(:finding_next_cookbook, "in #{dir.path}") do
-          if File.exists?(File.join(dir.path, 'metadata.json'))
-            @logger.operation(:reading_cookbook, "from #{dir.path}") do
-              cookbook = RightScraper::Resources::Cookbook.new(@repository, strip_repo_dir(dir.path))
-              @builder.go(dir.path, cookbook)
-              cookbook
-            end
-          else
-            @stack << dir
-            search_dirs
+    # Find the next cookbook, starting in dir.
+    #
+    # === Parameters
+    # dir(Dir):: directory to begin search in
+    def find_next(dir)
+      @logger.operation(:finding_next_cookbook, "in #{dir.path}") do
+        if COOKBOOK_SENTINELS.any? { |f| File.exists?(File.join(dir.path, f)) }
+          @logger.operation(:reading_cookbook, "from #{dir.path}") do
+            cookbook = RightScraper::Resources::Cookbook.new(
+              @repository,
+              strip_repo_dir(dir.path),
+              repo_dir)
+            @builder.go(dir.path, cookbook)
+            cookbook
           end
+        else
+          @stack << dir
+          search_dirs
         end
       end
+    end
 
-      # List of default scanners for this scaper
-      #
-      # === Return
-      # Array<Scanner>:: Default scanners
-      def default_scanners
-        [RightScraper::Scanners::CookbookMetadata,
-          RightScraper::Scanners::CookbookManifest]
-      end
-
-      # List of default builders for this scaper
-      #
-      # === Return
-      # Array<Builder>:: Default builders
-      def default_builders
-        [RightScraper::Builders::Filesystem]
-      end
+    # List of default scanners for this scaper
+    #
+    # === Return
+    # Array<Scanner>:: Default scanners
+    def default_scanners
+      [RightScraper::Scanners::CookbookMetadata,
+        RightScraper::Scanners::CookbookManifest]
+    end
 
-      # Add this scraper to the list of available types.
-      @@types[:cookbook] = RightScraper::Scrapers::Cookbook
- 
+    # List of default builders for this scaper
+    #
+    # === Return
+    # Array<Builder>:: Default builders
+    def default_builders
+      [RightScraper::Builders::Filesystem]
     end
+
+    # self-register
+    register_self
   end
 end

data/lib/right_scraper/scrapers/workflow.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright: Copyright (c) 2010-2011 RightScale, Inc.
+# Copyright: Copyright (c) 2010-2013 RightScale, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,73 +23,72 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
 
-module RightScraper
-  module Scrapers
+# ancestor
+require 'right_scraper/scrapers'
 
-    # Workflow scraper
-    class Workflow < Base
+module RightScraper::Scrapers
 
-     # Initialize list of known workflows on top of
-      def initialize(options)
-        @known_workflows = []
-        super(options)
-      end
+  # Workflow scraper
+  class Workflow < ::RightScraper::Scrapers::Base
+
+   # Initialize list of known workflows on top of
+    def initialize(options)
+      @known_workflows = []
+      super(options)
+    end
 
-      # Find the next workflows, starting in dir.
-      #
-      # === Parameters
-      # dir(Dir):: directory to begin search in
-      def find_next(dir)
-        @logger.operation(:finding_next_workflow, "in #{dir.path}") do
+    # Find the next workflows, starting in dir.
+    #
+    # === Parameters
+    # dir(Dir):: directory to begin search in
+    def find_next(dir)
+      @logger.operation(:finding_next_workflow, "in #{dir.path}") do
 
-          # Note: there could be multiple workflow definitions in one directory
-          # so we need to record the current position whether we found a workflow
-          # or not. The next iteration will search again in the current directory
-          # event if we found one. If we don't find one then we call 
-          # 'search_dirs' which will recurse in the sub-directories.
-          @stack << dir
+        # Note: there could be multiple workflow definitions in one directory
+        # so we need to record the current position whether we found a workflow
+        # or not. The next iteration will search again in the current directory
+        # event if we found one. If we don't find one then we call
+        # 'search_dirs' which will recurse in the sub-directories.
+        @stack << dir
 
-          def_ext = RightScraper::Resources::Workflow::DEFINITION_EXT
-          meta_ext = RightScraper::Resources::Workflow::METADATA_EXT
-          potentials = Dir[File.join(dir.path, "*#{def_ext}")]
-          potentials.reject! { |wdef| !File.exists?(wdef.chomp(File.extname(wdef)) + meta_ext) }
-          potentials.reject! { |wdef| @known_workflows.include?(wdef) }
-          unless potentials.empty?
-            wdef = potentials.first
-            relative_def = strip_repo_dir(wdef)
-            @logger.operation(:reading_workflow, "#{relative_def}") do
-              workflow = RightScraper::Resources::Workflow.new(@repository, relative_def)
-              @builder.go(File.dirname(wdef), workflow)
-              @known_workflows << wdef
-              workflow
-            end
-          else
-            search_dirs
+        def_ext = RightScraper::Resources::Workflow::DEFINITION_EXT
+        meta_ext = RightScraper::Resources::Workflow::METADATA_EXT
+        potentials = Dir[File.join(dir.path, "*#{def_ext}")]
+        potentials.reject! { |wdef| !File.exists?(wdef.chomp(File.extname(wdef)) + meta_ext) }
+        potentials.reject! { |wdef| @known_workflows.include?(wdef) }
+        unless potentials.empty?
+          wdef = potentials.first
+          relative_def = strip_repo_dir(wdef)
+          @logger.operation(:reading_workflow, "#{relative_def}") do
+            workflow = RightScraper::Resources::Workflow.new(@repository, relative_def)
+            @builder.go(File.dirname(wdef), workflow)
+            @known_workflows << wdef
+            workflow
           end
+        else
+          search_dirs
         end
       end
+    end
 
-      # List of default scanners for this scaper
-      #
-      # === Return
-      # Array<Scanner>:: Default scanners
-      def default_scanners
-        [RightScraper::Scanners::WorkflowMetadata,
-          RightScraper::Scanners::WorkflowManifest]
-      end
-
-      # List of default builders for this scaper
-      #
-      # === Return
-      # Array<Builder>:: Default builders
-      def default_builders
-        [RightScraper::Builders::Filesystem]
-      end
- 
-      # Add this scraper to the list of available types.
-      @@types[:workflow] = RightScraper::Scrapers::Workflow
+    # List of default scanners for this scaper
+    #
+    # === Return
+    # Array<Scanner>:: Default scanners
+    def default_scanners
+      [RightScraper::Scanners::WorkflowMetadata,
+        RightScraper::Scanners::WorkflowManifest]
+    end
 
+    # List of default builders for this scaper
+    #
+    # === Return
+    # Array<Builder>:: Default builders
+    def default_builders
+      [RightScraper::Builders::Filesystem]
     end
+
+    # self-register
+    register_self
   end
 end
-

data/lib/right_scraper/version.rb

@@ -22,6 +22,9 @@
 #++
 
 module RightScraper
+  # for gemspec, etc.
+  GEM_VERSION = '5.0.1'
+
   # (Fixnum) protocol versioning scheme; prepended to hashes to
   # prevent collisions.
   PROTOCOL_VERSION = 1

data/right_scraper.gemspec

@@ -21,36 +21,32 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'rubygems'
+require ::File.expand_path('../lib/right_scraper/version', __FILE__)
 
-Gem::Specification.new do |spec|
+::Gem::Specification.new do |spec|
   spec.name      = 'right_scraper'
-  spec.version   = '3.2.6'
-  spec.authors   = ['Graham Hughes', 'Raphael Simon', 'Scott Messier']
-  spec.email     = 'raphael@rightscale.com'
+  spec.version   = ::RightScraper::GEM_VERSION
+  spec.authors   = ['Raphael Simon', 'Tony Spataro', 'Scott Messier']
+  spec.email     = 'support@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'
-  spec.platform  = Gem::Platform::RUBY
+  spec.platform  = ::Gem::Platform::RUBY
   spec.summary   = 'Download and update remote repositories'
   spec.has_rdoc = true
   spec.rdoc_options = ["--main", "README.rdoc", "--title", "RightScraper"]
   spec.extra_rdoc_files = ["README.rdoc"]
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 2.1'
   spec.rubyforge_project = %q{right_scraper}
   spec.require_path = 'lib'
 
-  spec.add_dependency('json', '~> 1.4')
-  spec.add_dependency('blackwinter-git', '~> 1.2.7')
   spec.add_dependency('right_aws', '>= 2.0')
-  spec.add_dependency('right_popen', '~> 1.1.1')
-  spec.add_dependency('right_support', '~> 2.6')
+  spec.add_dependency('right_git')
+  spec.add_dependency('right_popen')
+  spec.add_dependency('right_support', '~> 2.8')
 
   spec.requirements << 'curl command line client'
   spec.requirements << 'git command line client'
   spec.requirements << 'Subversion command line client'
 
-  spec.add_development_dependency('rspec', '~> 2.0')
-  spec.add_development_dependency('flexmock', '~> 0.9')
-  spec.add_development_dependency('rtags', '~> 0.97')
-
   spec.description = <<-EOF
 RightScraper provides a simple interface to download and keep local copies of remote
 repositories up-to-date using the following protocols:
@@ -62,7 +58,7 @@ will analyze the repository content and instantiate "resources" as a result. Cur
 supported resources are Chef cookbooks and RightScale workflow definitions.
 EOF
 
-  candidates = Dir.glob("{lib,spec}/**/*") +
-               ["LICENSE", "README.rdoc", "Rakefile", "right_scraper.gemspec", "Gemfile", "right_scraper.rconf"]
+  candidates = ::Dir.glob("lib/**/*") +
+               %w(LICENSE README.rdoc right_scraper.gemspec)
   spec.files = candidates.sort
 end

metadata

@@ -1,184 +1,121 @@
 --- !ruby/object:Gem::Specification
 name: right_scraper
 version: !ruby/object:Gem::Version
-  version: 3.2.6
-  prerelease: 
+  version: 5.0.1
 platform: ruby
 authors:
-- Graham Hughes
 - Raphael Simon
+- Tony Spataro
 - Scott Messier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: blackwinter-git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: right_aws
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: right_popen
+  name: right_git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: right_support
+  name: right_popen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rtags
+  name: right_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.97'
-  type: :development
+        version: '2.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.97'
-description: ! "RightScraper provides a simple interface to download and keep local
-  copies of remote\nrepositories up-to-date using the following protocols:\n  * git:
-  RightScraper will clone then pull repos from git\n  * SVN: RightScraper will checkout
-  then update SVN repositories\n  * tarballs: RightScraper will download, optionally
-  uncompress and expand a given tar file\nOn top of retrieving remote repositories,
-  right_scraper also include \"scrapers\" that\nwill analyze the repository content
-  and instantiate \"resources\" as a result. Currently\nsupported resources are Chef
-  cookbooks and RightScale workflow definitions.\n"
-email: raphael@rightscale.com
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+description: |
+  RightScraper provides a simple interface to download and keep local copies of remote
+  repositories up-to-date using the following protocols:
+    * git: RightScraper will clone then pull repos from git
+    * SVN: RightScraper will checkout then update SVN repositories
+    * tarballs: RightScraper will download, optionally uncompress and expand a given tar file
+  On top of retrieving remote repositories, right_scraper also include "scrapers" that
+  will analyze the repository content and instantiate "resources" as a result. Currently
+  supported resources are Chef cookbooks and RightScale workflow definitions.
+email: support@rightscale.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- Gemfile
 - LICENSE
 - README.rdoc
-- Rakefile
 - lib/right_scraper.rb
+- lib/right_scraper/builders.rb
 - lib/right_scraper/builders/base.rb
 - lib/right_scraper/builders/filesystem.rb
 - lib/right_scraper/builders/union.rb
-- lib/right_scraper/logger.rb
-- lib/right_scraper/loggers/noisy.rb
-- lib/right_scraper/processes/ssh.rb
+- lib/right_scraper/loggers.rb
+- lib/right_scraper/loggers/base.rb
+- lib/right_scraper/loggers/default.rb
+- lib/right_scraper/main.rb
+- lib/right_scraper/processes.rb
+- lib/right_scraper/processes/shell.rb
+- lib/right_scraper/processes/ssh_agent.rb
+- lib/right_scraper/processes/svn_client.rb
+- lib/right_scraper/processes/warden.rb
+- lib/right_scraper/registered_base.rb
+- lib/right_scraper/repositories.rb
 - lib/right_scraper/repositories/base.rb
 - lib/right_scraper/repositories/download.rb
 - lib/right_scraper/repositories/git.rb
-- lib/right_scraper/repositories/mock.rb
 - lib/right_scraper/repositories/svn.rb
+- lib/right_scraper/resources.rb
 - lib/right_scraper/resources/base.rb
 - lib/right_scraper/resources/cookbook.rb
 - lib/right_scraper/resources/workflow.rb
+- lib/right_scraper/retrievers.rb
 - lib/right_scraper/retrievers/base.rb
-- lib/right_scraper/retrievers/checkout.rb
+- lib/right_scraper/retrievers/checkout_base.rb
 - lib/right_scraper/retrievers/download.rb
 - lib/right_scraper/retrievers/git.rb
 - lib/right_scraper/retrievers/svn.rb
+- lib/right_scraper/scanners.rb
 - lib/right_scraper/scanners/base.rb
 - lib/right_scraper/scanners/cookbook_manifest.rb
 - lib/right_scraper/scanners/cookbook_metadata.rb
@@ -187,83 +124,40 @@ files:
 - lib/right_scraper/scanners/workflow_manifest.rb
 - lib/right_scraper/scanners/workflow_metadata.rb
 - lib/right_scraper/scanners/workflow_s3_upload.rb
-- lib/right_scraper/scraper.rb
-- lib/right_scraper/scraper_logger.rb
+- lib/right_scraper/scrapers.rb
 - lib/right_scraper/scrapers/base.rb
 - lib/right_scraper/scrapers/cookbook.rb
 - lib/right_scraper/scrapers/workflow.rb
-- lib/right_scraper/svn_client.rb
 - lib/right_scraper/version.rb
 - right_scraper.gemspec
-- right_scraper.rconf
-- spec/builder_spec.rb
-- spec/cookbook_helper.rb
-- spec/cookbook_manifest_spec.rb
-- spec/cookbook_s3_upload_spec.rb
-- spec/download/download_retriever_spec.rb
-- spec/download/download_retriever_spec_helper.rb
-- spec/download/download_spec.rb
-- spec/download/multi_dir_spec.rb
-- spec/download/multi_dir_spec_helper.rb
-- spec/git/cookbook_spec.rb
-- spec/git/demokey
-- spec/git/demokey.pub
-- spec/git/password_key
-- spec/git/password_key.pub
-- spec/git/repository_spec.rb
-- spec/git/retriever_spec.rb
-- spec/git/retriever_spec_helper.rb
-- spec/git/scraper_spec.rb
-- spec/git/ssh_spec.rb
-- spec/git/url_spec.rb
-- spec/logger_spec.rb
-- spec/repository_spec.rb
-- spec/retriever_spec_helper.rb
-- spec/scanner_spec.rb
-- spec/scraper_helper.rb
-- spec/scraper_spec.rb
-- spec/spec_helper.rb
-- spec/svn/cookbook_spec.rb
-- spec/svn/multi_svn_spec.rb
-- spec/svn/multi_svn_spec_helper.rb
-- spec/svn/repository_spec.rb
-- spec/svn/retriever_spec.rb
-- spec/svn/scraper_spec.rb
-- spec/svn/svn_retriever_spec_helper.rb
-- spec/svn/url_spec.rb
-- spec/url_spec.rb
 homepage: https://github.com/rightscale/right_scraper
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --title
+- "--title"
 - RightScraper
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1166164135191250403
 requirements:
 - curl command line client
 - git command line client
 - Subversion command line client
 rubyforge_project: right_scraper
-rubygems_version: 1.8.26
+rubygems_version: 2.2.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Download and update remote repositories
 test_files: []