archive_uploader 0.1.0 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a76e506b3fd29c8d67484dbe865c0af07ec42b93
-  data.tar.gz: bf381c80762bb0b2bf2fc116ba534fa1c441d860
+  metadata.gz: 1107ecbcb18b38de6731e64ca3bd90e61b1f6ec5
+  data.tar.gz: 5adbcf5ff19e898e74bd1633a896c84f540ed4f6
 SHA512:
-  metadata.gz: bd45bb4ec796b90ebf2c805485df1c18fddb628d49ea0b0ce4a22874b289a12334ff6a50f6cf3fc416144b02ce7d7eefa028baf6361a7495b183507eaecab66c
-  data.tar.gz: 4001ff8ce55ebb46fafd7ae0fc391fa3d9b861ebc740fd26886a2e9ed8f23ad014a3cb3098f2fe54c28953870a9a21eeb637e7f99fea2b7d1b6338b6933a2d98
+  metadata.gz: 9a830ce2bf306e5c152cef5d21e896bd46aaa75c8f69c80c5e73b9e56e66468fc8e8d68f8bcc7b0970efd25348c283a758471841aac8e35b417e1b9ffa80078c
+  data.tar.gz: 95b6f09668382378c044ae155c4811a4281aaf127d087c02db4ec78e7f36f7ec421ae29c897cb5b43f537ed6e27eb4e2fc5d1cfcfcd8747078abfc5cb2cf9a8f

data/Gemfile

@@ -3,4 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in archive_uploader.gemspec
 gemspec
 
-gem 'curb'
+gem 'curb'
+
+group :development do
+  gem 'pry', :require => 'pry'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'rspec'
+end

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
 

data/archive_uploader.gemspec

@@ -20,8 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "pry"
 end

data/bin/archive_uploader

@@ -10,4 +10,6 @@ $:.unshift File.expand_path("../../lib", bin_file)
 
 # start up the CLI
 require "archive_uploader"
-ArchiveUploader.start(*ARGV)
+
+options = ArchiveUploader::CLI.parse(ARGV)
+ArchiveUploader.start(options)

data/lib/archive_uploader.rb

@@ -1,21 +1,30 @@
 require 'curl'
+require 'optparse'
+require 'ostruct'
 require 'tempfile'
 require "archive_uploader/archiver"
 require "archive_uploader/curb"
 require "archive_uploader/git"
 require "archive_uploader/version"
-require 'pry'
+require "archive_uploader/cli"
 
 module ArchiveUploader
   module_function
-  def start(*args)
+  def start(options)
+    @options = options
+    puts get_url
     puts "Start uploading files"
-    @file = Archiver.new(:files => args).perform!
+    @file = Archiver.new(:files => options.directories).perform!
     @git_data = Git.data
     # puts @git_data
-    puts Curb.new(:file => @file.path, :fields => @git_data, :url => ENV["ARCHIVE_UPLOADER_URL"]).perform!
+    puts Curb.new(:file => @file.path, :fields => @git_data, :url => ENV["ARCHIVE_UPLOADER_URL"], :auth => options.auth).perform!
     
   ensure
     FileUtils.rm(@file)
   end
+
+
+  def get_url
+    ENV["ARCHIVE_UPLOADER_URL"] || @options.url 
+  end
 end

data/lib/archive_uploader/cli.rb

@@ -0,0 +1,79 @@
+module ArchiveUploader
+  AUTH_METHODS = [:basic]
+  class CLIError < StandardError; end
+  class CLI
+    # return a structure describing the options
+    def self.parse(args)
+      options = OpenStruct.new
+      options.directories = []
+      options.verbose = false
+      options.auth = OpenStruct.new
+
+      opt_parser = OptionParser.new do |opts|
+        opts.banner = "Usage: archive_uploader [options]"
+
+        opts.separator ""
+        opts.separator "Specific options:"
+
+        # Directory
+        opts.on("-d", "--directory PATH",
+                "Add directory to archive") do |dir|
+          options.directories << dir
+        end
+
+        # List of arguments.
+        opts.on("-D x,y,z", Array, "Add list of files/directories") do |list|
+          options.directories += list
+        end
+
+        # Optional argument; auth method
+        opts.on("-a", "--authmethod [TYPE]",
+                "Set auth method",
+                "  (default disabled)") do |method|
+
+          raise CLIError unless AUTH_METHODS.include?(method.to_sym)
+          # Screw ruby object defining #method
+          options.auth._method = method.to_sym
+        end
+
+        # Optional argument; auth user
+        opts.on("-u", "--authuser [USER]",
+                "Set auth user",
+                "  (default none)") do |user|
+          options.auth.user = user
+        end
+
+        # Optional argument; auth password
+        opts.on("-p", "--authpassword [PASSWORD]",
+                "Set auth password",
+                "  (default none)") do |password|
+          options.auth.password = password
+        end
+
+        # Verbose
+        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+          options.verbose = v
+        end
+
+        opts.separator ""
+        opts.separator "Common options:"
+
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        # Another typical switch to print the version.
+        opts.on_tail("--version", "Show version") do
+          puts ArchiveUploder::VERSION.join('.')
+          exit
+        end
+      end
+
+      opt_parser.parse!(args)
+      options
+    end
+  end
+end

data/lib/archive_uploader/curb.rb

@@ -3,12 +3,22 @@ module ArchiveUploader
     def initialize(options={})
       @options = options
       @curl = Curl::Easy.new(@options[:url])
+      check_for_auth
     end
     
     def perform!
       @curl.multipart_form_post = true
       @curl.http_post(*post_data)
     end
+
+    def check_for_auth
+      return unless @options[:auth]
+      if @options[:auth]._method == :basic
+        @curl.http_auth_types = :basic
+        @curl.username = @options[:auth].user
+        @curl.password = @options[:auth].password
+      end
+    end
     
     def post_data
       fields = @options[:fields].collect do |field, value|
@@ -17,4 +27,4 @@ module ArchiveUploader
       [Curl::PostField.file('file[file]', @options[:file])] + fields
     end
   end
-end
+end

data/lib/archive_uploader/version.rb

@@ -1,3 +1,3 @@
 module ArchiveUploader
-  VERSION = "0.1.0"
+  VERSION = "0.2"
 end

data/spec/archive_uploader/cli_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ArchiveUploader::CLI do
+  it "returns list of directories when sent with -D" do
+    @argv = ["-D", "spec,bin"]
+    opts = ArchiveUploader::CLI.parse(@argv)
+    opts.directories.should =~ ["spec", "bin"]
+  end 
+
+  it "returns list of directories when sent with -d" do
+    @argv = ["-d", "spec", "-d", "bin"]
+    opts = ArchiveUploader::CLI.parse(@argv)
+    opts.directories.should =~ ["spec", "bin"]
+  end
+
+  it "sets auth.method to basic" do
+    @argv = ["-a", "basic"]
+    opts = ArchiveUploader::CLI.parse(@argv)
+    opts.auth._method.should eql(:basic)
+  end
+
+  it "sets auth.user to root" do
+    @argv = ["-u", "root"]
+    opts = ArchiveUploader::CLI.parse(@argv)
+    opts.auth.user.should eql("root")
+  end
+
+  it "sets auth.password to password" do
+    @argv = ["-p", "asdf"]
+    opts = ArchiveUploader::CLI.parse(@argv)
+    opts.auth.password.should eql("asdf")
+  end
+end

data/spec/archive_uploader/curb_spec.rb

@@ -46,4 +46,19 @@ describe ArchiveUploader::Curb do
       end
     end
   end
-end
+
+  describe "auth data" do
+    before :each do
+      @fields = {:branch => "master", :commit => "12345abc"}
+      @auth = OpenStruct.new(:_method => :basic, :user => "asdf", :password => "1234")
+      @curb = ArchiveUploader::Curb.new(:url => @url, :file => @tmpfile, :fields => @fields, :auth => @auth)
+    end
+
+    it "sets auth vars to curl object" do
+      @curl = @curb.instance_variable_get("@curl")
+      @curl.http_auth_types.should eql(1)
+      @curl.username.should eql("asdf")
+      @curl.password.should eql("1234")
+    end
+  end
+end

data/spec/archive_uploader_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'pry'
+
+describe ArchiveUploader do
+  #it "sets basic methods (black box)" do
+    #@argv = ["-a", "basic", "-u", "user123", "-p", "sekret"]
+
+    #ArchiveUploader::Curb.any_instance.stub(:new) do
+      #@curl.http_auth_types.should eql(1)
+      #@curl.username.should eql("user123")
+      #@curl.password.should eql("sekret")
+    #end
+    
+    #options = ArchiveUploader::CLI.parse(@argv)
+    #ArchiveUploader.start(options)
+  #end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archive_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: '0.2'
 platform: ruby
 authors:
 - Teodor Pripoae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,62 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Upload stats to stat_fu webserver
 email:
 - teodor.pripoae@gmail.com
@@ -113,10 +57,13 @@ files:
 - bin/archive_uploader
 - lib/archive_uploader.rb
 - lib/archive_uploader/archiver.rb
+- lib/archive_uploader/cli.rb
 - lib/archive_uploader/curb.rb
 - lib/archive_uploader/git.rb
 - lib/archive_uploader/version.rb
+- spec/archive_uploader/cli_spec.rb
 - spec/archive_uploader/curb_spec.rb
+- spec/archive_uploader_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -143,5 +90,7 @@ signing_key:
 specification_version: 4
 summary: Upload stats to stat_fu webserver
 test_files:
+- spec/archive_uploader/cli_spec.rb
 - spec/archive_uploader/curb_spec.rb
+- spec/archive_uploader_spec.rb
 - spec/spec_helper.rb