sshkit 0.0.21 → 0.0.22

data/CHANGELOG.md

@@ -3,10 +3,27 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.22
+
+  * Added naïve implementations of `upload!()` and `download!()` (syncoronous) to
+    the Net::SSH backend. See `EXAMPLES.md` for more extensive usage examples.
+
+    The `upload!()` method can take a filename, or an `IO`, this reflects the way
+    the underlying Net::SCP implementation works. The same is true of
+    `download!()`, when called with a single argument it captures the file's
+    contents, otherwise it downloads the file to the local disk.
+
+        on hosts do |host|
+          upload!(StringIO.new('some-data-here'), '~/.ssh/authorized_keys')
+          upload!('~/.ssh/id_rsa.pub', '~/.ssh/authorized_keys')
+          puts download!('/etc/monit/monitrc')
+          download!('/etc/monit/monitrc', '~/monitrc')
+        end
+
 ## 0.0.21
 
   * Fixed an issue with default formatter
-  * Modified SSHKit.config.output_verbosity= to accept different objects:
+  * Modified `SSHKit.config.output_verbosity=` to accept different objects:
 
         SSHKit.config.output_verbosity = Logger::INFO
         SSHKit.config.output_verbosity = :info

data/EXAMPLES.md

@@ -31,6 +31,20 @@
       end
     end
 
+## Print some arbitrary output with the logging methods
+
+    on hosts do |host|
+      f = '/some/file'
+      if test("[ -d #{f} ]")
+        execute :touch, f
+      else
+        info "#{f} already exists on #{host}!"
+      end
+    end
+
+The `debug()``, `info()`, `warn()`, `error()` and `fatal()` honor the current
+log level of `SSHKit.config.output_verbosity`
+
 ## Run a command in a different directory as a different user
 
     on hosts do |host|
@@ -50,8 +64,39 @@ This will output:
 **Note:** This example is a bit misleading, as the `www-data` user doesn't
 have a shell defined, one cannot switch to that user.
 
-## Run a command with a different effective group ID
+## Upload a file from disk
+
+    on hosts do |host|
+      upload! '/config/database.yml', '/opt/my_project/shared/databse.yml'
+    end
+
+**Note:** The `upload!()` method doesn't honor the values of `in()`, `as()`
+etc, this will be improved as the library matures, but we're not there yet.
 
+## Upload a file from a stream
+
+    on hosts do |host|
+      file = File.open('/config/database.yml')
+      io   = StringIO.new(....)
+      upload! file, '/opt/my_project/shared/databse.yml'
+      upload! io,   '/opt/my_project/shared/io.io.io'
+    end
+
+The IO streaming is useful for uploading something rather than "cat"ing it,
+for example
+
+    on hosts do |host|
+      contents = StringIO.new('ALL ALL = (ALL) NOPASSWD: ALL')
+      upload! contents, '/etc/sudoers.d/yolo'
+    end
+
+This spares one from having to figure out the correct escaping sequences for
+something like "echo(:cat, '...?...', '> /etc/sudoers.d/yolo')".
+
+**Note:** The `upload!()` method doesn't honor the values of `in()`, `as()`
+etc, this will be improved as the library matures, but we're not there yet.
+
+## Run a command with a different effective group ID
 
     on hosts do |host|
       as user: 'www-data', group: 'project-group' do
@@ -60,6 +105,7 @@ have a shell defined, one cannot switch to that user.
           execute :ls, '-l'
         end
       end
+    end
 
 One will see that the created file is owned by the user `www-data` and the
 group `project-group`.

data/Gemfile

@@ -1,2 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
+
 gemspec

data/README.md

@@ -193,13 +193,13 @@ At present the `Logger::WARN`, `ERROR` and `FATAL` are not used.
 * No environment handling (sshkit might not need to care)
 * ~~No arbitrary `Host` properties (example storing `roles` on servers, or other
   metadata that might be useful in the `on()` block)~~
-* No log/warning facility (passing Log messages to the output would work)
+* ~~No log/warning facility (passing Log messages to the output would work)
   A log object could be made available globally which would emit a LogMessage
   type object which would be recognised by the formatters that need to care
-  about them.
-* No verbosity control, commands should have a `Logger::LEVEL` on them,
+  about them.~~
+* ~~No verbosity control, commands should have a `Logger::LEVEL` on them,
   user-generated should be at a high level, the commands auto-generated from
-  the guards and checks from as() and within() should have a lower level.
+  the guards and checks from as() and within() should have a lower level.~~
 * ~~Decide if `execute()` (and friends) should raise on non-zero exit statuses or
   not, perhaps a family of similarly named bang methods should be the ones to
   raise. (Perhaps `test()` should be a way to `execute()` without raising, and
@@ -208,8 +208,13 @@ At present the `Logger::WARN`, `ERROR` and `FATAL` are not used.
   have that method setter do the legwork of updating `SSHKit.config.output` to
   be an instance of the correct formatter class wrapping the existing output
   stream.~~
+* No "trace" level debugging for internal stuff, the debug level should be
+  reserved for client-level debugging, with trace being (int -1) used
+  internally for logging about connection opening, closing, timing out, etc.
+* No method for uploading or downloading files, or the same for saving/loading
+  a string to/from a remote file.
 * No closing of connections, the abstract backend class should include a
-  cleanup method which is empty but can be overriden by
+  cleanup method which is empty but can be overriden by other implementations.
 * No conncetion pooling, the `connection` method of the NetSSH backend could
   easily be modified to look into some connection factory for it's objects,
   saving half a second when running lots of `on()` blocks.

data/Vagrantfile

@@ -1,5 +1,6 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+#
+# vi: set ft=ruby
+#
 
 Vagrant::Config.run do |config|
 

data/lib/sshkit/all.rb

@@ -8,6 +8,8 @@ require_relative 'command'
 require_relative 'configuration'
 require_relative 'coordinator'
 
+require_relative 'log_message'
+
 require_relative 'formatters/abstract'
 require_relative 'formatters/black_hole'
 require_relative 'formatters/pretty'

data/lib/sshkit/backends/abstract.rb

@@ -1,4 +1,5 @@
 module SSHKit
+
   module Backend
 
     MethodUnavailableError = Class.new(SSHKit::StandardError)
@@ -17,6 +18,30 @@ module SSHKit
         @block = block
       end
 
+      def log(messages)
+        info(messages)
+      end
+
+      def fatal(messages)
+        output << LogMessage.new(Logger::FATAL, messages)
+      end
+
+      def error(messages)
+        output << LogMessage.new(Logger::ERROR, messages)
+      end
+
+      def warn(messages)
+        output << LogMessage.new(Logger::WARN, messages)
+      end
+
+      def info(messages)
+        output << LogMessage.new(Logger::INFO, messages)
+      end
+
+      def debug(messages)
+        output << LogMessage.new(Logger::DEBUG, messages)
+      end
+
       def make(commands=[])
         raise MethodUnavailableError
       end
@@ -48,8 +73,8 @@ module SSHKit
             then echo "Directory does not exist '#{File.join(@pwd)}'" 1>&2
             false
           fi
-        EOTEST
-        yield
+          EOTEST
+          yield
       ensure
         @pwd.pop
       end
@@ -95,5 +120,7 @@ module SSHKit
       end
 
     end
+
   end
+
 end

data/lib/sshkit/backends/netssh.rb

@@ -37,6 +37,18 @@ module SSHKit
         _execute(*[*args, options]).stdout.strip
       end
 
+      def upload!(local, remote, options = {})
+        ssh.scp.upload!(local, remote, options) do
+          warn "Progress"
+        end
+      end
+
+      def download!(remote, local=nil, options = {})
+        ssh.scp.download!(remote, local, options) do
+          warn "Progress"
+        end
+      end
+
       class << self
         def configure
           yield config

data/lib/sshkit/formatters/dot.rb

@@ -7,10 +7,9 @@ module SSHKit
     class Dot < Abstract
 
       def write(obj)
-        if obj.is_a? SSHKit::Command
-          if obj.finished?
-            original_output << (obj.failure? ? c.red('.') : c.green('.'))
-          end
+        return unless obj === SSHKit::Command
+        if obj.finished?
+          original_output << (obj.failure? ? c.red('.') : c.green('.'))
         end
       end
       alias :<< :write

data/lib/sshkit/formatters/pretty.rb

@@ -7,42 +7,48 @@ module SSHKit
     class Pretty < Abstract
 
       def write(obj)
-        if obj.is_a? SSHKit::Command
-
-          return if obj.verbosity < SSHKit.config.output_verbosity
+        return if obj.verbosity < SSHKit.config.output_verbosity
+        case obj
+        when SSHKit::Command    then write_command(obj)
+        when SSHKit::LogMessage then write_log_message(obj)
+        else
+          original_output << c.black(c.on_yellow("Output formatter doesn't know how to handle #{obj.class}\n"))
+        end
+      end
+      alias :<< :write
 
-          unless obj.started?
-            original_output << level(obj.verbosity) + uuid(obj) + "Running #{c.yellow(c.bold(String(obj)))} on #{c.blue(obj.host.to_s)}\n"
-            if SSHKit.config.output_verbosity == Logger::DEBUG
-              original_output << level(Logger::DEBUG) + uuid(obj) + c.white("Command: #{c.blue(obj.to_command)}") + "\n"
-            end
-          end
+      private
 
+      def write_command(command)
+        unless command.started?
+          original_output << level(command.verbosity) + uuid(command) + "Running #{c.yellow(c.bold(String(command)))} on #{c.blue(command.host.to_s)}\n"
           if SSHKit.config.output_verbosity == Logger::DEBUG
-            if obj.complete? && !obj.stdout.empty?
-              obj.stdout.lines.each do |line|
-                original_output << level(Logger::DEBUG) + uuid(obj) + c.green("\t" + line)
-              end
-            end
+            original_output << level(Logger::DEBUG) + uuid(command) + c.white("Command: #{c.blue(command.to_command)}") + "\n"
+          end
+        end
 
-            if obj.complete? && !obj.stderr.empty?
-              obj.stderr.lines.each do |line|
-                original_output << level(Logger::DEBUG) + uuid(obj) + c.red("\t" + line)
-              end
+        if SSHKit.config.output_verbosity == Logger::DEBUG
+          if command.complete? && !command.stdout.empty?
+            command.stdout.lines.each do |line|
+              original_output << level(Logger::DEBUG) + uuid(command) + c.green("\t" + line)
             end
           end
 
-          if obj.finished?
-            original_output << level(obj.verbosity) + uuid(obj) + "Finished in #{sprintf('%5.3f seconds', obj.runtime)} command #{c.bold { obj.failure? ? c.red('failed') : c.green('successful') }}.\n"
+          if command.complete? && !command.stderr.empty?
+            command.stderr.lines.each do |line|
+              original_output << level(Logger::DEBUG) + uuid(command) + c.red("\t" + line)
+            end
           end
+        end
 
-        else
-          original_output << c.black(c.on_yellow("Output formatter doesn't know how to handle #{obj.inspect}\n"))
+        if command.finished?
+          original_output << level(command.verbosity) + uuid(command) + "Finished in #{sprintf('%5.3f seconds', command.runtime)} command #{c.bold { command.failure? ? c.red('failed') : c.green('successful') }}.\n"
         end
       end
-      alias :<< :write
 
-      private
+      def write_log_message(log_message)
+        original_output << level(log_message.verbosity) + log_message.to_s + "\n"
+      end
 
       def c
         @c ||= Term::ANSIColor
@@ -59,11 +65,11 @@ module SSHKit
       end
 
       def level_formatting(level_num)
-        %w{black blue yellow red red }[level_num]
+        %w{ black blue yellow red red }[level_num]
       end
 
       def level_names(level_num)
-        %w{DEBUG INFO WARN ERROR FATAL}[level_num]
+        %w{ DEBUG INFO WARN ERROR FATAL }[level_num]
       end
 
     end

data/lib/sshkit/log_message.rb

@@ -0,0 +1,13 @@
+module SSHKit
+
+  class LogMessage
+    attr_reader :verbosity, :message
+    def initialize(verbosity, message)
+      @verbosity, @message = verbosity, message
+    end
+    def to_s
+      @message.to_s.strip
+    end
+  end
+
+end

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/sshkit.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency('term-ansicolor')
 
   gem.add_development_dependency('minitest', ['>= 2.11.3', '< 2.12.0'])
-  gem.add_development_dependency('autotest')
   gem.add_development_dependency('rake')
   gem.add_development_dependency('turn')
   gem.add_development_dependency('unindent')

data/test/functional/backends/test_netssh.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'securerandom'
 require 'benchmark'
 
 module SSHKit
@@ -92,6 +93,44 @@ module SSHKit
         assert_match "sleep 5", process_list
       end
 
+      def test_upload_file
+        file_contents = ""
+        file_name = File.join("/tmp", SecureRandom.uuid)
+        File.open file_name, 'w+' do |f|
+          f.write 'example_file'
+        end
+        Netssh.new(a_host) do
+          upload!(file_name, file_name)
+          file_contents = capture(:cat, file_name)
+        end.run
+        assert_equal "example_file", file_contents
+      end
+
+      def test_upload_string_io
+        file_contents = ""
+        Netssh.new(a_host) do |host|
+          file_name = File.join("/tmp", SecureRandom.uuid)
+          upload!(StringIO.new('example_io'), file_name)
+          file_contents = download!(file_name)
+        end.run
+        assert_equal "example_io", file_contents
+      end
+
+      def test_upload_large_file
+        size      = 25
+        fills     = SecureRandom.random_bytes(1024*1024)
+        file_name = "/tmp/file-#{size}.txt"
+        File.open(file_name, 'w') do |f|
+          (size).times {f.write(fills) }
+        end
+        file_contents = ""
+        Netssh.new(a_host) do
+          upload!(file_name, file_name)
+          file_contents = download!(file_name)
+        end.run
+        assert_equal File.open(file_name).read, file_contents
+      end
+
     end
 
   end

data/test/unit/formatters/test_pretty.rb

@@ -0,0 +1,51 @@
+require 'helper'
+require 'sshkit'
+
+module SSHKit
+  class TestPretty < UnitTest
+
+    def setup
+      SSHKit.config.output_verbosity = Logger::DEBUG
+    end
+
+    def output
+      @_output ||= String.new
+    end
+
+    def pretty
+      @_pretty ||= SSHKit::Formatter::Pretty.new(output)
+    end
+
+    def teardown
+      remove_instance_variable :@_pretty
+      remove_instance_variable :@_output
+      SSHKit.reset_configuration!
+    end
+
+    def test_logging_fatal
+      pretty << SSHKit::LogMessage.new(Logger::FATAL, "Test")
+      assert_equal output.strip, " \e[31mFATAL\e[0m Test \n".strip
+    end
+
+    def test_logging_error
+      pretty << SSHKit::LogMessage.new(Logger::ERROR, "Test")
+      assert_equal output.strip, " \e[31mERROR\e[0m Test \n".strip
+    end
+
+    def test_logging_warn
+      pretty << SSHKit::LogMessage.new(Logger::WARN, "Test")
+      assert_equal output.strip, " \e[33mWARN\e[0m Test \n".strip
+    end
+
+    def test_logging_info
+      pretty << SSHKit::LogMessage.new(Logger::INFO, "Test")
+      assert_equal output.strip, " \e[34mINFO\e[0m Test \n".strip
+    end
+
+    def test_logging_debug
+      pretty << SSHKit::LogMessage.new(Logger::DEBUG, "Test")
+      assert_equal output.strip, " \e[30mDEBUG\e[0m Test \n".strip
+    end
+
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
+  prerelease: 
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,41 +10,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.11.3
     - - <
@@ -52,137 +58,140 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.11.3
     - - <
       - !ruby/object:Gem::Version
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: autotest
-  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: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unindent
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vagrant
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A comprehensive toolkit for remotely running commands in a structured
@@ -225,6 +234,7 @@ files:
 - lib/sshkit/formatters/dot.rb
 - lib/sshkit/formatters/pretty.rb
 - lib/sshkit/host.rb
+- lib/sshkit/log_message.rb
 - lib/sshkit/runners/abstract.rb
 - lib/sshkit/runners/group.rb
 - lib/sshkit/runners/parallel.rb
@@ -238,32 +248,34 @@ files:
 - test/unit/backends/test_netssh.rb
 - test/unit/backends/test_printer.rb
 - test/unit/core_ext/test_string.rb
+- test/unit/formatters/test_pretty.rb
 - test/unit/test_command.rb
 - test/unit/test_configuration.rb
 - test/unit/test_coordinator.rb
 - test/unit/test_host.rb
 homepage: http://wacku.github.com/sshkit
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
 test_files:
 - test/functional/backends/test_netssh.rb
@@ -273,7 +285,9 @@ test_files:
 - test/unit/backends/test_netssh.rb
 - test/unit/backends/test_printer.rb
 - test/unit/core_ext/test_string.rb
+- test/unit/formatters/test_pretty.rb
 - test/unit/test_command.rb
 - test/unit/test_configuration.rb
 - test/unit/test_coordinator.rb
 - test/unit/test_host.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8db213100be25113e238342987c5a12ed7412b15
-  data.tar.gz: 7067bc10963a3d8f98f45711075418bed865c590
-SHA512:
-  metadata.gz: ab26645180f7f6ecc458735ec542b620024ee612d35738c0219d7add6a20fc7388e1b9f4c872370e9a2fb74dd100a7efc740d0b73d517b391a411b7f29104e92
-  data.tar.gz: f3f840a846d275c20ad325134eb37caa582cf20d7025bf15a69ca82c024ef10ee2c797505d26e4d7f284499b4a5707f46c2c783ac66534db9e2ccdad23fe4342