cinch 2.0.7 → 2.0.8

data/lib/cinch/bot.rb

@@ -47,7 +47,6 @@ require "cinch/configuration/bot"
 require "cinch/configuration/plugins"
 require "cinch/configuration/ssl"
 require "cinch/configuration/timeouts"
-# require "cinch/configuration/storage"
 require "cinch/configuration/dcc"
 require "cinch/configuration/sasl"
 
@@ -292,13 +291,6 @@ module Cinch
       end while @config.reconnect and not @quitting
     end
 
-    def stop
-      # @plugins.each do |plugin|
-      #   plugin.storage.save
-      #   plugin.storage.unload
-      # end
-    end
-
     # @endgroup
     # @group Channel Control
 

data/lib/cinch/configuration/bot.rb

@@ -37,7 +37,6 @@ module Cinch
           :timeouts => Configuration::Timeouts.new,
           :ping_interval => 120,
           :delay_joins => 0,
-          # :storage => Configuration::Storage.new,
           :dcc => Configuration::DCC.new,
           :sasl => Configuration::SASL.new,
           :shared => {},

data/lib/cinch/irc.rb

@@ -383,7 +383,7 @@ module Cinch
         else
           send_cap_end
         end
-      when "NACK"
+      when "NAK"
         send_cap_end
       end
     end

data/lib/cinch/plugin.rb

@@ -432,15 +432,11 @@ module Cinch
     # @return [Array<Cinch::Timer>]
     attr_reader :timers
 
-    # @return [Storage] The per-plugin persistent storage
-    # attr_reader :storage
-
     # @api private
     def initialize(bot)
       @bot = bot
       @handlers = []
       @timers   = []
-      # @storage  = bot.config.storage.backend.new(@bot.config.storage, self)
       __register
     end
 

data/lib/cinch/version.rb

@@ -1,4 +1,4 @@
 module Cinch
   # Version of the library
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies: []
 description: A simple, friendly DSL for creating IRC bots
 email:
@@ -43,7 +43,6 @@ files:
 - lib/cinch/sasl.rb
 - lib/cinch/cached_list.rb
 - lib/cinch/bot.rb
-- lib/cinch/storage.rb
 - lib/cinch/isupport.rb
 - lib/cinch/helpers.rb
 - lib/cinch/handler.rb
@@ -58,7 +57,6 @@ files:
 - lib/cinch/mask.rb
 - lib/cinch/configuration/sasl.rb
 - lib/cinch/configuration/bot.rb
-- lib/cinch/configuration/storage.rb
 - lib/cinch/configuration/plugins.rb
 - lib/cinch/configuration/ssl.rb
 - lib/cinch/configuration/dcc.rb
@@ -76,8 +74,6 @@ files:
 - lib/cinch/constants.rb
 - lib/cinch/mode_parser.rb
 - lib/cinch/user.rb
-- lib/cinch/storage/yaml.rb
-- lib/cinch/storage/null.rb
 - lib/cinch/logger/formatted_logger.rb
 - lib/cinch/logger/zcbot_logger.rb
 - lib/cinch/exceptions.rb
@@ -104,7 +100,6 @@ files:
 - examples/plugins/autovoice.rb
 - examples/plugins/multiple_matches.rb
 - examples/plugins/url_shorten.rb
-- examples/plugins/memo.rb
 - examples/plugins/own_events.rb
 - examples/plugins/seen.rb
 - examples/plugins/last_nick.rb

data/examples/plugins/memo.rb

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'cinch'
-require 'cinch/storage/yaml'
-
-class Memo
-  class MemoStruct < Struct.new(:user, :channel, :text, :time)
-    def to_s
-      "[#{time.asctime}] <#{channel}/#{user}> #{text}"
-    end
-  end
-
-  include Cinch::Plugin
-
-  def initialize(*args)
-    super
-    storage[:memos] ||= {}
-  end
-
-  listen_to :message
-  match /memo (.+?) (.+)/
-
-  def listen(m)
-    if storage[:memos].has_key?(m.user.nick)
-      m.user.send storage[:memos].delete(m.user.nick).to_s
-      storage.save
-    end
-  end
-
-  def execute(m, nick, message)
-    if storage[:memos].key?(nick)
-      m.reply "There's already a memo for #{nick}. You can only store one right now"
-    elsif nick == m.user.nick
-      m.reply "You can't leave memos for yourself.."
-    elsif nick == bot.nick
-      m.reply "You can't leave memos for me.."
-    else
-      storage[:memos][nick] = MemoStruct.new(m.user.name, m.channel.name, message, Time.now)
-      storage.save
-      m.reply "Added memo for #{nick}"
-    end
-  end
-end
-
-bot = Cinch::Bot.new do
-  configure do |c|
-    c.server = "irc.freenode.org"
-    c.channels = ["#cinch-bots"]
-    c.plugins.plugins = [Memo]
-    c.storage.backend = Cinch::Storage::YAML
-    c.storage.basedir = "./yaml/"
-    c.storage.autosave = true
-  end
-end
-
-bot.start

data/lib/cinch/configuration/storage.rb

@@ -1,31 +0,0 @@
-require "cinch/configuration"
-require "cinch/storage/null"
-
-module Cinch
-  class Configuration
-    # @since 2.0.0
-    class Storage < Configuration
-      KnownOptions = [:backend]
-
-      def self.default_config
-        {
-          :backend => Cinch::Storage::Null
-        }
-      end
-
-      def load(new_config, from_default)
-        _new_config = {}
-        new_config.each do |option, value|
-          case option
-          when :backend
-            _new_config[option] = Cinch::Utilities::Kernel.string_to_const(value)
-          else
-            _new_config[option] = value
-          end
-        end
-
-        super(_new_config, from_default)
-      end
-    end
-  end
-end

data/lib/cinch/storage.rb

@@ -1,63 +0,0 @@
-module Cinch
-  # @note The interface of this class isn't fixed yet. You shouldn't
-  #   use it yet.
-  class Storage
-    include Enumerable
-
-    # @param [Hash] options
-    # @param [Plugin] plugin
-    def initialize(options, plugin)
-    end
-
-    # @param [Object] key
-    # @return [Object, nil]
-    def [](key)
-    end
-
-    # @param [Object] key
-    # @param [Object] value
-    # @return [value]
-    def []=(key, value)
-    end
-
-    # @return [self]
-    def each
-      self
-    end
-
-    # @return [self]
-    def each_key
-      self
-    end
-
-    # @return [self]
-    def each_value
-      self
-    end
-
-    # @param [Object] key
-    # @return [Boolean]
-    def has_key?(key)
-      false
-    end
-    alias_method :include?, :has_key?
-    alias_method :key?, :has_key?
-    alias_method :member?, :has_key?
-
-    # @param [Object] key
-    # @return [Object, nil] The deleted object
-    def delete(key)
-    end
-
-    # @return [self]
-    def delete_if
-      self
-    end
-
-    def save
-    end
-
-    def unload
-    end
-  end
-end

data/lib/cinch/storage/null.rb

@@ -1,12 +0,0 @@
-require "cinch/storage"
-
-module Cinch
-  class Storage
-    # The Null storage is the default storage (used if the user didn't
-    # supply a different storage) and will simply ignore all requests.
-    # This way, plugins will continue to work if programmed properly,
-    # but no data will be preserved.
-    class Null < Storage
-    end
-  end
-end

data/lib/cinch/storage/yaml.rb

@@ -1,96 +0,0 @@
-require "cinch/storage"
-require "yaml"
-
-module Cinch
-  class Storage
-    # A basic storage backed by YAML, using one file per plugin.
-    class YAML < Storage
-      # (see Storage#initialize)
-      def initialize(options, plugin)
-        # We are a basic example, so we load everything into memory. yey.
-        @file = options.basedir + plugin.class.plugin_name + ".yaml"
-        if File.exist?(@file)
-          @yaml = ::YAML.load_file(@file) || {}
-        else
-          @yaml = {}
-        end
-        @options = options
-
-        @mutex = Mutex.new
-      end
-
-      # (see Storage#[])
-      def [](key)
-        @yaml[key]
-      end
-
-      # (see Strage#[]=)
-      def []=(key, value)
-        @yaml[key] = value
-      end
-
-      # (see Storage#has_key?)
-      def has_key?(key)
-        @yaml.has_key?(key)
-      end
-      alias_method :include?, :has_key?
-      alias_method :key?, :has_key?
-      alias_method :member?, :has_key?
-
-      # (see Storage#each)
-      def each
-        @yaml.each {|e| yield(e)}
-
-        self
-      end
-
-      # (see Storage#each_key)
-      def each_key
-        @yaml.each_key {|e| yield(e)}
-
-        self
-      end
-
-      # (see Storage#each_value)
-      def each_value
-        @yaml.each_value {|e| yield(e)}
-
-        self
-      end
-
-      # (see Storage#delete)
-      def delete(key)
-        obj = @yaml.delete(key)
-
-        obj
-      end
-
-      # (see Storage#delete_if)
-      def delete_if
-        delete_keys = []
-        each do |key, value|
-          delete_keys << key if yield(key, value)
-        end
-
-        delete_keys.each do |key|
-          delete(key)
-        end
-
-        self
-      end
-
-      # (see Storage#save)
-      def save
-        @mutex.synchronize do
-          File.open(@file, "w") do |f|
-            f.write @yaml.to_yaml
-          end
-        end
-      end
-
-      # (see Storage#unload)
-      def unload
-      end
-    end
-  end
-end