woro 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b95b362f677b55672cbf3f6fd70ee7b1d66551af
-  data.tar.gz: 2be0c9ad7365d1c755d1d2b24dbfab13c2b88f50
+  metadata.gz: 1fc039fcb30ca0249690a9faa835fe36b0a791b3
+  data.tar.gz: 9049c6ace163fa2570cb74f27e09024c86c940b3
 SHA512:
-  metadata.gz: db55fd8f7bbee3528608990b764da0d6747492087bc94fae475bd5f8cd4d5634913bd73658fc8a44289ad20d920bb6ea561de61e26a5fb33a231095b2cb4118e
-  data.tar.gz: 4aed67765b981c0f2ff6da55a2c06f8f2aadd33f8c935ac236920244ec605280e80ab749a9523b0d3f2668c9647c1f385d0a15403e5d106be09e4cce9e029773
+  metadata.gz: 16c86c137ee7bbc88d1db72b1adb66d659382c4235caad2c2e7d302ab2835fd9788e33db4f2890702e2c85999bc77e1f3108c917903e81a6ab1b79208578f0d7
+  data.tar.gz: 02f0df2c3afd3dffed2de0833f6bb64ced14dd2bdca2898fe97eabbd5795f94c456c3cca194f2f2fe08048cb8301d5e96180abb7e5d7c0a2f448b1b9693e37b7

data/README.md

@@ -6,12 +6,19 @@ Manage one-time remote tasks in your Rails project.
 Plugins with Mina and Capistrano to add support for rake tasks hosted in remote collection, such as Gist.
 
 Say you have a data migration to perform on a remote server. The procedure is too complex to just do it in the remote console and using database migrations would be evil. A rake task would be nice, but checking this in with the source code repository adds clutter, as you know you will only run this once.
-Woro offers a quick way of pushing rake tasks onto the remote server, execute them and delete them instantly. Using Github's gist, you keep version control of the tasks and can share them with colleagues.
+Woro offers a quick way of pushing rake tasks onto the remote server, execute them and delete them instantly.
 
 Woro helps you create rake tasks, that you can develop and run locally.
-Once you are ready, woro let's you push them online to a remote collection like Gist.
+Once you are ready, woro let's you push them online to a remote storage like FTP or other adapters like Gist or S3.
 Using a mina deployment setup, these tasks are downloaded on the remote system, executed by rake and cleaned up afterwards.
 
+### Adapters
+
+By default Woro comes with support for FTP, but additional adapters are available:
+
+* [woro-gist](https://github.com/github/woro-gist)
+* [woro-s3](https://github.com/github/woro-s3)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -87,7 +94,7 @@ Once you are done writing the task and you want to execute it on the remote syst
 First you have to push them online, in this case to Gist.
 
 ```shell
-$ woro push gist:cleanup_users
+$ woro push ftp:cleanup_users
 ```
 
 _Attention, depending on whether you set up a Gist/Github login on
@@ -97,13 +104,13 @@ private under the specified Github account._
 Now, to run a task remotely using Mina, specify the task:
 
 ```shell
-$ mina woro:run task=gist:cleanup_users
+$ mina woro:run task=ftp:cleanup_users
 ```
 
 Or to run it with Capistrano:
 
 ```shell
-$ cap woro:run task=gist:cleanup_users
+$ cap woro:run task=ftp:cleanup_users
 ```
 
 To show a list of all tasks uploaded to any collection do:
@@ -116,7 +123,7 @@ $ woro ls
 And finally you can download an existing task to your local woro tasks directory.
 
 ```shell
-$ woro pull gist:cleanup_users
+$ woro pull ftp:cleanup_users
 ```
 
 ## Testing

data/bin/woro

@@ -14,8 +14,7 @@ to just do it in the remote console and using database migrations would be evil.
 A rake task would be nice, but checking this in with the source code repository
 adds clutter, as you know you will only run this once.
 Woro offers a quick way of pushing rake tasks onto the remote server, execute them
-and delete them instantly. Using Github\'s gist, you keep version control of the tasks
-and can share them with colleagues.
+and delete them instantly.
 
 Woro helps you create rake tasks, that you can develop and run locally.
 Once you are ready, woro let\'s you push them online to a remote collection like Gist.
@@ -27,18 +26,19 @@ default_command :list
 def create_directory_unless_existing(directory)
   unless File.exists? directory
     FileUtils.mkdir_p directory
-    say "Created #{directory}"
+    say "Created `#{directory}`"
   end
 end
 
 def create_required_files
   create_directory_unless_existing Woro::Configuration.woro_task_dir
   create_directory_unless_existing Woro::Configuration.rake_task_dir
+  create_directory_unless_existing File.dirname(Woro::Configuration.config_file)
 
   unless File.exists? File.join(Woro::Configuration.rake_task_dir, 'woro.rake')
     FileUtils.cp(File.dirname(__FILE__) + '/../lib/woro/templates/woro.rake',
                  Woro::Configuration.rake_task_dir)
-    say "Created woro.rake in #{Woro::Configuration.rake_task_dir}"
+    say "Created `woro.rake` in `#{Woro::Configuration.rake_task_dir}`"
   end
 end
 
@@ -49,42 +49,36 @@ def woro_environment_setup?
     File.exists?(File.join(Woro::Configuration.rake_task_dir, 'woro.rake'))
 end
 
+def select_choice(choices)
+  choose do |menu|
+    menu.prompt = 'Please choose a service to use with Woro:'
+    menu.choices(*choices) do |choice|
+      return choice.to_s.strip
+    end
+  end
+end
+
+def choose_and_build_adapter_config(available_adapters)
+  adapter_name = select_choice available_adapters
+  adapter = Object.const_get "Woro::Adapters::#{adapter_name}"
+  { adapter_name => adapter.setup }
+end
+
 command :init do |c|
   c.syntax      = 'woro init [options]'
   c.description = 'Initialize Woro in the current Rails directory and setup Gist collection'
   c.option '--[no-]force', 'force overwrite of existing config file'
   c.action do |args, options|
-
-    if agree 'Login to Gist/Github for private Woro tasks (Yes/No)?  '
-      Gist.login!
-    #elsif agree 'Login to AWS/S3 for private Woro tasks (Yes/No)?  '
-
-    end
-    # if none of these, use gist, but public
-
-    # create Gist with welcome file
-    # additional tasks will be added to this first gist
+    available_adapters = Woro::Adapters.constants.reject { |name| name == :Base }
+    adapters = {}
     begin
-      require File.join(Dir.pwd, 'config', 'application.rb')
-      app_name = Rails.application.class.parent_name
-    rescue LoadError
-      app_name = ask('Application name: ')
-    end
-    result = Woro::Adapters::Gist.create_initial_remote_task(app_name)
-
-    # configure adapters
-    gist_adapter = {
-      gist_id: result['id'],
-      public: false
-    }
+      adapters.merge! choose_and_build_adapter_config(available_adapters)
+    end while agree('Do you want to configure another service?')
+    options.default(adapters: adapters )
 
-    unless File.exists? File.dirname(Woro::Configuration.config_file)
-      FileUtils.mkdir_p File.dirname(Woro::Configuration.config_file)
-    end
+    create_required_files
 
-    options.default(adapters: { gist: gist_adapter } )
     config = Woro::Configuration.save(options.__hash__)
-    create_required_files
   end
 end
 
@@ -114,25 +108,25 @@ command :push do |c|
   c.syntax      = 'woro push <task> [options]'
   c.summary     = 'Push tasks to remote collection, updates existing tasks'
   c.description = 'Pushes one or more local tasks to the remote collection. Existing tasks by this name in the remote connection will be updated.'
-  c.example 'Pushes the task "cleanup" to the remote collection', 'woro push cleanup'
+  c.example 'Pushes the task "cleanup" to the remote collection', 'woro push ftp:cleanup'
   c.action do |args, options|
     abort 'Woro environment is not set up. Call `woro init` to do so.' unless woro_environment_setup?
 
     config = Woro::Configuration.load
     args.each do |arg|
       unless arg.include?(':')
-        say_error "Does not specify upload target"
+        say_error "Does not specify upload service, eg `woro push ftp:#{arg}`"
         next
       end
       adapter_name, task_name = arg.split(':')
-      adapter = config.adapter adapter_name
-      # Pushes a new woro task by given name to gist, this can be done multiple time.
+      # Pushes a new woro task by given name to storage, this can be done multiple time.
       task = Woro::Task.new(task_name)
       if task.exists?
+        adapter = config.adapter adapter_name
         result = adapter.push(task)
-        say "Uploaded #{task.file_path} to #{result['url']}"
+        say "Uploaded `#{task.file_path} to #{result['url']}"
       else
-        say "Task #{task.task_name} not found at #{task.file_path}"
+        say "Task `#{task.task_name}` not found at `#{task.file_path}`"
       end
     end
   end
@@ -142,7 +136,7 @@ command :pull do |c|
   c.syntax      = 'woro pull <task> [options]'
   c.summary     = 'Pull Woro task from remote repository'
   c.description = 'Pulls one task from the remote collection. Existing local tasks can be overwritten.'
-  c.example 'Pulls the task "cleanup" from the remote collection', 'woro pull gist:cleanup'
+  c.example 'Pulls the task "cleanup" from the remote collection', 'woro pull ftp:cleanup'
   c.option '--[no-]force', 'force overwrite of existing task file'
   c.action do |args, options|
     abort 'Woro environment is not set up. Call `woro init` to do so.' unless woro_environment_setup?
@@ -150,7 +144,7 @@ command :pull do |c|
     config = Woro::Configuration.load
     args.each do |arg|
       unless arg.include?(':')
-        say_error "Does not specify download target"
+        say_error "Does not specify download service, eg `woro pull ftp:#{arg}`"
         next
       end
       adapter_name, task_name = arg.split(':')
@@ -169,26 +163,26 @@ command :list do |c|
   c.syntax      = 'woro [list|ls] [options]'
   c.description = 'List tasks'
   c.example 'List remote tasks', 'woro list'
-  c.example 'List all tasks', 'woro list --all'
-  c.option '-a', '--all', 'List all tasks'
+  #c.example 'List all tasks', 'woro list --all'
+  #c.option '-a', '--all', 'List all tasks'
   c.action do |args, options|
     abort 'Woro environment is not set up. Call `woro init` to do so.' unless woro_environment_setup?
     abort "invalid command. See 'woro help' for more information" unless args.empty?
     config = Woro::Configuration.load
-    config.adapters.each do |adapter_config|
-      puts "#{adapter_config[0]} ---"
-      adapter = config.adapter(adapter_config[0])
-      files = adapter.list_keys || {}
+    config.adapter_settings.each do |adapter_setting|
+      say "#{adapter_setting[0]} ---"
+      adapter = config.adapter(adapter_setting[0])
+      files = adapter.list_contents || {}
       tasks = files.map do |file_name, data|
         if file_name.include? '.rake'
           OpenStruct.new(name_with_args: file_name.split('.rake').first,
-                         comment: adapter.extract_description(data))
+                         comment: adapter.extract_description(data[:data]))
         end
       end
       tasks.compact!
       Woro::TaskHelper.print_task_list(tasks)
     end
-    puts "local ---"
+    say "local ---"
     tasks = Woro::TaskHelper.woro_task_files(config.woro_task_dir) do |file_name, data|
       OpenStruct.new(name_with_args: file_name.split('.rake').first,
                      comment: Woro::TaskHelper.extract_description(data))

data/features/configuration.feature

@@ -8,11 +8,29 @@ Feature: Configure woro
 
   Scenario: Initialize configuration without Rails environment
     When I run `woro init` interactively
-    And I type "n\n"
-    And I type "Rails-project\n"
-    Then the output should contain "Initialized config file in `config/woro.yml`"
+    And I type "Ftp"
+    And I type "localhost"
+    And I type "Username"
+    And I type "Password"
+    And I type "/"
+    And I type "n"
+    Then the output should contain exactly:
+    """
+    1. Ftp
+    Please choose a service to use with Woro:
+    FTP Host: FTP User: FTP Passwod: FTP Folder: |/| Do you want to configure another service?
+    Created `lib/woro_tasks`
+    Created `lib/tasks`
+    Created `config`
+    Created `woro.rake` in `lib/tasks`
+    Initialized config file in `config/woro.yml`
+
+    """
+    And the following directories should exist:
+      | lib/woro_tasks      |
+      | lib/tasks           |
     And the following files should exist:
-      | config/woro.yml   |
+      | lib/tasks/woro.rake |
 
   Scenario: Initialize configuration (no clobber)
     Given a file named "config/woro.yml" with:
@@ -20,8 +38,12 @@ Feature: Configure woro
       hello world
       """
     When I run `woro init` interactively
-    And I type "n\n"
-    And I type "Rails-project\n"
+    And I type "Ftp"
+    And I type "localhost"
+    And I type "Username"
+    And I type "Password"
+    And I type "/"
+    And I type "n"
     Then the output should contain "Not overwriting existing config file"
 
   Scenario: Force initialize configuration (clobber)
@@ -30,6 +52,10 @@ Feature: Configure woro
       hello world
       """
     When I run `woro init --force` interactively
-    And I type "n\n"
-    And I type "Rails-project\n"
+    And I type "Ftp"
+    And I type "localhost"
+    And I type "Username"
+    And I type "Password"
+    And I type "/"
+    And I type "n"
     Then the file "config/woro.yml" should not contain "hello world"

data/features/manage_tasks.feature

@@ -16,7 +16,6 @@ Feature: Manage Woro task
 
     """
 
-
   Scenario: List tasks without environment setup
     Given I run `woro list`
     Then the output should contain "Woro environment is not set up. Call `woro init` to do so."
@@ -48,6 +47,22 @@ Feature: Manage Woro task
     When I run `woro push stub:cleanup`
     Then the output should contain "Woro environment is not set up. Call `woro init` to do so."
 
+  Scenario: Push local task to remote without adapter name
+    Given the Woro environment is set up
+    When I run `woro push cleanup`
+    Then the output should contain "Does not specify upload service, eg `woro push ftp:cleanup`"
+
+  Scenario: Push unknown local task
+    Given the Woro environment is set up
+    When I run `woro push ftp:cleanup_all --trace`
+    Then the output should contain "Task `cleanup_all` not found at `lib/woro_tasks/cleanup_all.rake`"
+
   Scenario: Pull local task to remote without environment
     When I run `woro pull stub:cleanup`
     Then the output should contain "Woro environment is not set up. Call `woro init` to do so."
+
+  Scenario: Pull local task to remote without adapter name
+    Given the Woro environment is set up
+    When I run `woro pull cleanup`
+    Then the output should contain "Does not specify download service, eg `woro pull ftp:cleanup`"
+

data/features/support/env.rb

@@ -2,7 +2,6 @@ require "aruba/cucumber"
 require 'cucumber/rspec/doubles'
 
 Before do
-  allow(Gist).to receive(:multi_gist).and_return({ 'id' => '1234'})
 end
 
 After do

data/lib/woro.rb

@@ -1,5 +1,14 @@
 require 'woro/version'
 require 'woro/task_helper'
 require 'woro/task'
-require 'woro/adapters/gist'
+require 'woro/adapters/base'
+require 'woro/adapters/ftp'
 require 'woro/configuration'
+
+# require any gem with the prefix "woro" found in the gemset
+[].tap do |woro_specs|
+  Gem::Specification::each do |spec|
+    woro_specs << spec.name if spec.name.start_with?('woro') && spec.name != 'woro'
+  end
+  woro_specs.uniq.each { |spec| require spec }
+end

data/lib/woro/adapters/base.rb

@@ -0,0 +1,49 @@
+require 'commander'
+module Woro
+  module Adapters
+    class Base
+      include ::Commander::UI
+
+      # Extract description from file content string.
+      # @param content [String] content of task file
+      # [String] description string
+      def extract_description(content)
+        Woro::TaskHelper.extract_description content
+      end
+
+      # Returns the list of files included in the Gist
+      # @return [Array] List of file names
+      def list_files
+        fail('Requires implementation')
+      end
+
+      # Returns the list of files included in the Gist
+      # @return [Hash] List of files in the format { filename: { data }}
+      def list_contents
+        fail('Requires implementation')
+      end
+
+      # Push this task's file content to the Gist collection on the server.
+      # Existing contents by the same #file_name will be overriden, but
+      # can be accessed via Github or Gist's API.
+      def push(task)
+        fail('Requires implementation')
+      end
+
+      # Creates an initial welcome gist on project setup
+      # @param app_name [String] Name of the app is displayed in the
+      # initial welcome message
+      def self.create_initial_remote_task(app_name, access_token = nil)
+        # not implemented
+      end
+
+      # The raw url is a permalink for downloading the content rake task within
+      # the Gist as a file.
+      # @param file_name [String] name of the file to retrieve the download url
+      # @return [String] HTTP-URL of addressed file within the gist collection
+      def raw_url(file_name)
+        fail('Requires implementation')
+      end
+    end
+  end
+end

data/lib/woro/adapters/ftp.rb

@@ -0,0 +1,87 @@
+require 'net/ftp'
+module Woro
+  module Adapters
+    class Ftp < Base
+      attr_accessor :host, :user, :password, :folder
+
+      # Setup configuration for adapter
+      # Highline CLI helpers can be used for interactivity.
+      # @return [Hash] Configuration options
+      def self.setup
+        {
+          'host' =>     ask('FTP Host: '),
+          'user' =>     ask('FTP User: '),
+          'password' => ask('FTP Passwod: '),
+          'folder' =>   ask('FTP Folder: ') { |q| q.default = '/' }
+        }
+      end
+
+      def initialize(options = [])
+        self.host = options['host']
+        self.user = options['user']
+        self.password = options['password']
+        self.folder = options['folder'] || '/'
+      end
+
+      # Returns the list of rake files included in the remote collection.
+      # @return [Array] List of files
+      def list_files
+        [].tap do |files|
+          remote_files do |file|
+            files << file
+          end
+        end
+      end
+
+      # Returns the list of rake files included in the remote collection
+      # with their contents.
+      # @return [Hash] List of files with their contents
+      def list_contents
+        {}.tap do |files|
+          remote_files do |file|
+            ftp.gettextfile(file) do |line, newline|
+              content.concat newline ? line + "\n" : line
+            end # temporarly downloads the file
+            FileUtils.rm file
+            files[file] = { data: content }
+          end
+        end
+      end
+
+      # Push this task's file content to ftp server.
+      # Existing contents by the same #file_name will be overriden.
+      def push(task)
+        client do |ftp|
+          ftp.chdir(folder)
+          ftp.put(task.file_path, task.file_name)
+        end
+      end
+
+      # The raw url is for downloading the rake task content via ftp.
+      # @param file_name [String] name of the file to retrieve the download url
+      # @return [String] HTTP-URL of addressed file within the gist collection
+      def raw_url(file_name)
+        "ftp://#{user}@#{host}#{folder}#{file_name}"
+      end
+
+      protected
+
+      def remote_files
+        client do |ftp|
+          ftp.chdir(folder)
+          ftp.nlst.each do |file|
+            yield file if file.include?('.rake')
+          end
+        end
+      end
+
+      def client
+        Net::FTP.open(host, user, password) do |ftp|
+          yield(ftp)
+        end
+      rescue => e
+        say_error "Error connecting to ftp://#{host}: #{e.message}"
+      end
+    end
+  end
+end

data/lib/woro/configuration.rb

@@ -4,20 +4,20 @@ include Commander::UI
 
 module Woro
   class Configuration
-    attr_reader :adapters, :woro_task_dir, :app_name
+    attr_reader :adapter_settings, :woro_task_dir, :app_name
 
     # Initialize configuration.
     def initialize(options = {})
       @woro_task_dir = Configuration.woro_task_dir
-      @adapters = options[:adapters] || {}
-      @app_name = options[:app_name]
+      @adapter_settings = options['adapters'] || {}
+      @app_name = options['app_name']
     end
 
     # Load configuration file or default_options. Passed options take precedence.
     def self.load(options = {})
-      user_options = options.reject{|k,v| ![:adapters, :app_name].include? k}
+      user_options = options.reject { |k, v| !['adapters', 'app_name'].include? k }
 
-      if !(File.exists? config_file)
+      unless File.exist? config_file
         File.open(config_file, 'w') { |file| YAML.dump(default_options, file) }
         say "Initialized default config file in `#{config_file}`. See 'woro help init' for options."
       end
@@ -28,10 +28,10 @@ module Woro
 
     # Save configuration. Passed options take precendence over default_options.
     def self.save(options = {})
-      user_options = options.reject{|k,v| ![:adapters, :app_name].include? k}
+      user_options = options.reject { |k, v| !['adapters', 'app_name'].include? k }
       force_save = options.delete :force
 
-      if !(File.exists? config_file) || force_save
+      if !File.exist?(config_file) || force_save
         File.open(config_file, 'w') do |file|
           YAML.dump(default_options.merge(user_options), file)
         end
@@ -42,13 +42,9 @@ module Woro
       self
     end
 
-    def adapter(name)
-      options = adapters[name.to_sym]
-
-      case name.to_sym
-      when :gist
-        @gist_adapter ||= Woro::Adapters::Gist.new(options[:gist_id])
-      end
+    def adapter(adapter_name)
+      clazz = Object.const_get("Woro::Adapters::#{adapter_name.capitalize}")
+      clazz.new adapter_settings[adapter_name.downcase]
     end
 
     # Helpers

data/lib/woro/task.rb

@@ -10,7 +10,8 @@ module Woro
       @task_name = Woro::Task.sanitize_task_name task_name
     end
 
-    # @param task_name [String] sanitized name of the task, used throughout the further processing
+    # @param task_name [String] sanitized name of the task, used
+    # throughout the further processing
     # @return [Task] the created task
     def self.create(task_name)
       task = Woro::Task.new(task_name)
@@ -52,6 +53,7 @@ module Woro
     end
 
     # Read the content of the local rake task file on #file_path.
+    # @return [String] file content
     def read_task_file
       File.read(file_path)
     end

data/lib/woro/task_helper.rb

@@ -1,8 +1,6 @@
 module Woro
   class TaskHelper
-
     class << self
-
       def print_task_list(tasks)
         width ||= tasks.map { |t| t.name_with_args.length }.max || 10
         tasks.each do |t|

data/lib/woro/tasks/mina.rake

@@ -15,7 +15,7 @@ namespace :woro do
     task = Woro::Task.new(task_name)
     print_status "Execute #{task.task_name} remotely"
     in_directory "#{app_path}" do
-      queue! "cd 'lib/tasks' && curl #{adapter.raw_url(task.file_name)} -o woro_#{task.file_name}"
+      queue! "curl '#{adapter.raw_url(task.file_name)}' -o lib/tasks/woro_#{task.file_name}"
       queue! "#{bundle_prefix} rake woro:#{task.task_name}"
       queue! "rm lib/tasks/woro_#{task.file_name}"
     end

data/lib/woro/version.rb

@@ -1,4 +1,4 @@
 module Woro
   # Look shiny!
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/lib/woro/configuration_spec.rb

@@ -5,11 +5,11 @@ describe Woro::Configuration do
   describe '#initialize' do
     it 'instantiates object' do
       options = {
-        adapters: %(foo baz),
-        app_name: 'bar'
+        'adapters' => %(foo baz),
+        'app_name' => 'bar'
       }
       config = Woro::Configuration.new(options)
-      expect(config.adapters).to eq %(foo baz)
+      expect(config.adapter_settings).to eq %(foo baz)
       expect(config.app_name).to eq 'bar'
     end
   end
@@ -18,7 +18,7 @@ describe Woro::Configuration do
     context 'not given a configuration file' do
       it 'returns Configuration object with default options' do
         config = Woro::Configuration.load
-        expect(config.adapters).to eq({})
+        expect(config.adapter_settings).to eq({})
         expect(config.app_name).to be_falsy
       end
 
@@ -32,8 +32,8 @@ describe Woro::Configuration do
     context 'given a configuration file' do
       before(:each) do
         opts = {
-          adapters: %w(foo baz),
-          app_name: 'bar'
+          'adapters' => %w(foo baz),
+          'app_name' => 'bar'
         }
         File.open(Woro::Configuration.config_file, 'w') do |file|
           YAML.dump(opts, file)
@@ -42,18 +42,18 @@ describe Woro::Configuration do
 
       it 'returns Configuration object with options in file' do
         config = Woro::Configuration.load
-        expect(config.adapters).to eq %w(foo baz)
+        expect(config.adapter_settings).to eq %w(foo baz)
         expect(config.app_name).to eq 'bar'
       end
 
       context 'given options' do
         it 'overrides options in configuration file' do
           options = {
-            adapters:  %w(goo grr),
-            app_name: 'car'
+            'adapters' => %w(goo grr),
+            'app_name' => 'car'
           }
           config = Woro::Configuration.load(options)
-          expect(config.adapters).to eq %w(goo grr)
+          expect(config.adapter_settings).to eq %w(goo grr)
           expect(config.app_name).to eq 'car'
         end
       end
@@ -63,8 +63,8 @@ describe Woro::Configuration do
   describe '.save' do
     let(:options) do
       {
-        adapters: ['foo', 'baz'],
-        app_name: 'bar'
+        'adapters' => ['foo', 'baz'],
+        'app_name' => 'bar'
       }
     end
 
@@ -79,8 +79,8 @@ describe Woro::Configuration do
     context 'given a configuration file' do
       before(:each) do
         opts = {
-          adapters: ['goo', 'grr'],
-          app_name: 'car'
+          'adapters' => ['goo', 'grr'],
+          'app_name' => 'car'
         }
         File.open(Woro::Configuration.config_file, 'w') do |file|
           YAML.dump(opts, file)

data/woro.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "gist"
   spec.add_dependency "commander"
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: woro
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Senff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +157,8 @@ files:
 - lib/capistrano/woro.rb
 - lib/mina/woro.rb
 - lib/woro.rb
-- lib/woro/adapters/gist.rb
+- lib/woro/adapters/base.rb
+- lib/woro/adapters/ftp.rb
 - lib/woro/configuration.rb
 - lib/woro/task.rb
 - lib/woro/task_helper.rb
@@ -181,8 +168,6 @@ files:
 - lib/woro/templates/woro.rake
 - lib/woro/version.rb
 - spec/fixtures/cleanup.rake
-- spec/fixtures/gist.json
-- spec/lib/woro/adapters/gist_spec.rb
 - spec/lib/woro/configuration_spec.rb
 - spec/lib/woro/task_spec.rb
 - spec/spec_helper.rb
@@ -218,8 +203,6 @@ test_files:
 - features/step_definitions/woro_steps.rb
 - features/support/env.rb
 - spec/fixtures/cleanup.rake
-- spec/fixtures/gist.json
-- spec/lib/woro/adapters/gist_spec.rb
 - spec/lib/woro/configuration_spec.rb
 - spec/lib/woro/task_spec.rb
 - spec/spec_helper.rb

data/lib/woro/adapters/gist.rb

@@ -1,82 +0,0 @@
-require 'gist'
-
-module Woro
-  module Adapters
-    class Gist
-
-      attr_reader :gist_id
-
-      # Create a new gist collection adapter
-      # @param gist_id [String] gist to which the adapter connects
-      def initialize(gist_id)
-        @gist_id = gist_id
-      end
-
-      # Returns the list of files included in the Gist
-      # @return [Hash] List of files in the format { filename: { data }}
-      def list_keys
-        gist['files']
-      end
-
-      # Push this task's file content to the Gist collection on the server.
-      # Existing contents by the same #file_name will be overriden, but
-      # can be accessed via Github or Gist's API.
-      def push(task)
-        ::Gist.multi_gist({ task.file_name => task.read_task_file },
-                        public: false,
-                        update: gist_id,
-                        output: :all)
-      end
-
-      # The Gist contains a collection of files.
-      # These are stored and accessed on Github.
-      # @return [Hash] parsed JSON hash of the gist's metadata
-      def gist
-        @gist ||= retrieve_gist(gist_id)
-      end
-
-      # Retrieves metadata of the specified gist
-      # @param gist_id [String] id of the gist
-      # @return [Hash] parsed JSON hash
-      def retrieve_gist(gist_id)
-        service_url = "https://api.github.com/gists/#{gist_id}"
-        response = Net::HTTP.get_response(URI.parse(service_url))
-        JSON.parse(response.body || '')
-      end
-
-      # Retrieves the data hash included in the gist under the #file_name.
-      # @param file_name [String] name of the file to retrieve the download url
-      # @return [Hash] parsed JSON hash
-      def retrieve_file_data(file_name)
-        gist['files'][file_name]
-      end
-
-      # The raw url is a permalink for downloading the content rake task within
-      # the Gist as a file.
-      # @param file_name [String] name of the file to retrieve the download url
-      # @return [String] HTTP-URL of addressed file within the gist collection
-      def raw_url(file_name)
-        retrieve_file_data(file_name)['raw_url']
-      end
-
-      # Creates an initial welcome gist on project setup
-      # @param app_name [String] Name of the app is displayed in the initial welcome message
-      def self.create_initial_remote_task(app_name, access_token=nil)
-        ::Gist.gist("Welcome to the Woro Task Repository for #{app_name}", filename: app_name, access_token: access_token)
-      end
-
-      # Extract description from gist's data content string.
-      # @param data [Hash] gist data hash
-      # [String] description string
-      def extract_description(data)
-        Woro::TaskHelper.extract_description(data['content'])
-      end
-
-      # Read the rake task template
-      # @return [String]
-      def read_template_file
-        File.read(File.join(File.dirname(__FILE__), 'templates','task.rake') )
-      end
-    end
-  end
-end

data/spec/fixtures/gist.json

@@ -1,103 +0,0 @@
-{
-  "url": "https://api.github.com/gists/aa5a315d61ae9438b18d",
-  "forks_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/forks",
-  "commits_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/commits",
-  "id": "aa5a315d61ae9438b18d",
-  "description": "description of gist",
-  "public": true,
-  "owner": {
-    "login": "octocat",
-    "id": 1,
-    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/octocat",
-    "html_url": "https://github.com/octocat",
-    "followers_url": "https://api.github.com/users/octocat/followers",
-    "following_url": "https://api.github.com/users/octocat/following{/other_user}",
-    "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
-    "organizations_url": "https://api.github.com/users/octocat/orgs",
-    "repos_url": "https://api.github.com/users/octocat/repos",
-    "events_url": "https://api.github.com/users/octocat/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/octocat/received_events",
-    "type": "User",
-    "site_admin": false
-  },
-  "user": null,
-  "files": {
-    "create_user.rake": {
-      "size": 932,
-      "raw_url": "https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl",
-      "type": "text/plain",
-      "language": "Ruby",
-      "truncated": false,
-      "content": "namespace :woro do\n  desc 'Create User'\n  task create_user: :environment do\n    # Code\n  end\nend\n"
-    }
-  },
-  "comments": 0,
-  "comments_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/comments/",
-  "html_url": "https://gist.github.com/aa5a315d61ae9438b18d",
-  "git_pull_url": "https://gist.github.com/aa5a315d61ae9438b18d.git",
-  "git_push_url": "https://gist.github.com/aa5a315d61ae9438b18d.git",
-  "created_at": "2010-04-14T02:15:15Z",
-  "updated_at": "2011-06-20T11:34:15Z",
-  "forks": [
-    {
-      "user": {
-        "login": "octocat",
-        "id": 1,
-        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/octocat",
-        "html_url": "https://github.com/octocat",
-        "followers_url": "https://api.github.com/users/octocat/followers",
-        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
-        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
-        "organizations_url": "https://api.github.com/users/octocat/orgs",
-        "repos_url": "https://api.github.com/users/octocat/repos",
-        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/octocat/received_events",
-        "type": "User",
-        "site_admin": false
-      },
-      "url": "https://api.github.com/gists/dee9c42e4998ce2ea439",
-      "id": "dee9c42e4998ce2ea439",
-      "created_at": "2011-04-14T16:00:49Z",
-      "updated_at": "2011-04-14T16:00:49Z"
-    }
-  ],
-  "history": [
-    {
-      "url": "https://api.github.com/gists/aa5a315d61ae9438b18d/57a7f021a713b1c5a6a199b54cc514735d2d462f",
-      "version": "57a7f021a713b1c5a6a199b54cc514735d2d462f",
-      "user": {
-        "login": "octocat",
-        "id": 1,
-        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/octocat",
-        "html_url": "https://github.com/octocat",
-        "followers_url": "https://api.github.com/users/octocat/followers",
-        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
-        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
-        "organizations_url": "https://api.github.com/users/octocat/orgs",
-        "repos_url": "https://api.github.com/users/octocat/repos",
-        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/octocat/received_events",
-        "type": "User",
-        "site_admin": false
-      },
-      "change_status": {
-        "deletions": 0,
-        "additions": 180,
-        "total": 180
-      },
-      "committed_at": "2010-04-14T02:15:15Z"
-    }
-  ]
-}

data/spec/lib/woro/adapters/gist_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-describe Woro::Adapters::Gist do
-
-  let!(:gist_id) { rand(999)}
-  let(:task) { Woro::Task.new('create_user') }
-  subject { Woro::Adapters::Gist.new(gist_id) }
-  let(:gist_hash) do
-    FakeFS.deactivate!
-    body = File.read(File.join('spec', 'fixtures', 'gist.json'))
-    FakeFS.activate!
-    JSON.parse(body)
-  end
-
-  before do
-    allow(subject).to receive(:gist).once.and_return gist_hash
-  end
-
-  describe '#list_keys' do
-    it 'returns list' do
-      expected_list = {
-        "create_user.rake" => {
-          "size"=>932, "raw_url"=>"https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl", "type"=>"text/plain", "language"=>"Ruby", "truncated"=>false, "content"=>"namespace :woro do\n  desc 'Create User'\n  task create_user: :environment do\n    # Code\n  end\nend\n"
-        }
-      }
-      expect(subject.list_keys).to eq expected_list
-    end
-  end
-
-  describe '#push' do
-    it 'calls gist services with correct params' do
-      File.open(task.file_path, 'w') do |f|
-        f.puts 'hey'
-      end
-      expected_files_hash = { task.file_name => task.read_task_file }
-      expected_params_hash = { public: false,
-                               update: gist_id,
-                               output: :all
-                              }
-      expect(Gist).to receive(:multi_gist).with(expected_files_hash, expected_params_hash).and_return gist_hash
-      subject.push(task)
-    end
-  end
-
-
-  describe '#retrieve_file_data' do
-    it 'returns data hash from file' do
-      expected_hash = {
-        "size"=>932, "raw_url"=>"https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl", "type"=>"text/plain", "language"=>"Ruby", "truncated"=>false, "content"=>"namespace :woro do\n  desc 'Create User'\n  task create_user: :environment do\n    # Code\n  end\nend\n"
-      }
-      expect(subject.retrieve_file_data('create_user.rake')).to eq expected_hash
-    end
-  end
-
-  describe '#raw_url' do
-    it 'returns raw_url of file' do
-      expected_url = "https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl"
-      expect(subject.raw_url('create_user.rake')).to eq expected_url
-    end
-  end
-end