ramesh 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f095feb67813f3fc287cae0facf015f91cb6a8ed
-  data.tar.gz: 7e375fa8880fa9cf421c74944c6cd8f9c4ec19ff
+  metadata.gz: 70c9be78a66d6d02b4a882874ff795aaa5fd13d0
+  data.tar.gz: b057347aca5b9b104358c8e810d08e70cbdd08cd
 SHA512:
-  metadata.gz: 6842b6ad926081e3f31064693b1505bbd26ae5cfbbb96d7136bb2ad4f0441bd94fe988b67db492638f59cf2db4e673fb134ee7644ca2740fca6f4a1b3bb62fe0
-  data.tar.gz: bab705ad4c7ff24a27b47f91efd0c86b6558725cd5fd3d829301da45616fb09ddc5fb8222dcba53b79899286f1431bfa3162265e856ce576d2e91cf592136691
+  metadata.gz: bfcd3e5df4f56bc52571c983bf2c296dbee2896eb33089a852353aa77161420ee3a57a17b2707323533976e8e86d71a1d204bb221cfc774dae229e9222899851
+  data.tar.gz: fde72af13834220b9ad77f62486fed6d8d6a9fbf9733545e37707825dea0bcb6bab8f266f6ab62b81cd7bb4b4bbc0c1abfa5226fcd89f50abe8e58be68a34889

data/bin/ramesh

@@ -5,16 +5,18 @@ require "ramesh"
 
 USAGE = <<-EOS
 Usage:
-    ramesh [-d save_dir]              download the latest image
-    ramesh [-d save_dir] 0-120        download the image specified minutes before
-    ramesh [-d save_dir] 0-120 0-120  download images within a specified range
-    ramesh -h, --help                 show this usage
+    ramesh [-d save_dir] [-f filename]                 download the latest image
+    ramesh [-d save_dir] [-f filename] 0..120          download the image specified minutes before
+    ramesh [-d save_dir] [-f filename] 0..120 0..120   download images within a specified range
+    ramesh -h, --help                                  show this usage
 EOS
 
 save_dir = Dir.pwd
+filename = nil
 
 parser = OptionParser.new(USAGE) do |opt|
   opt.on("-d", "--dir=VAL", "Save directory (default: current directory)") { |val| save_dir = val }
+  opt.on("-f", "--filename=VAL", "Save file name (default: timestamp index of downloaded image)") { |val| filename = val }
 end
 
 argv = parser.parse(ARGV)
@@ -23,11 +25,11 @@ client = Ramesh::Client.new(Ramesh::Logger.new(STDOUT))
 
 case argv.length
 when 0
-  client.download_image(save_dir)
+  client.download_image(0, save_dir, filename)
 when 1
-  client.download_image(save_dir, argv[0].to_i)
+  client.download_image(argv[0].to_i, save_dir, filename)
 when 2
-  client.download_sequential_images(save_dir, argv[0].to_i, argv[1].to_i)
+  client.download_sequential_images(argv[0].to_i, argv[1].to_i, save_dir)
 else
   $stderr.puts USAGE
   exit 1

data/lib/ramesh/client.rb

@@ -6,19 +6,20 @@ module Ramesh
       @logger = logger
     end
 
-    def download_image(save_dir, minute = 0)
+    def download_image(minute, save_dir, filename = nil)
       unless valid_minutes?(minute)
         raise ArgumentError, "minutes must be a number; 0, 5, 10, ... 120"
       end
 
       image_name = name_from_minute(minute)
+      filename ||= "#{image_name}.jpg"
       image = Image.new(image_name, background_image, mask_image)
-      image.save(save_dir, image_name)
+      image.save(save_dir, filename)
 
-      @logger.info("Downloaded: #{image_name}.jpg")
+      @logger.info("Downloaded: #{filename}")
     end
 
-    def download_sequential_images(save_dir, from, to)
+    def download_sequential_images(from, to, save_dir)
       unless valid_minutes?(from) && valid_minutes?(to)
         raise ArgumentError, "minutes must be a number; 0, 5, 10, ... 120"
       end

data/lib/ramesh/image.rb

@@ -26,8 +26,8 @@ module Ramesh
       @image = composite_images(image_list)
     end
 
-    def save(save_dir, image_name)
-      save_path = File.join(save_dir, "#{image_name}.jpg")
+    def save(save_dir, filename)
+      save_path = File.join(save_dir, filename)
       @image.write(save_path)
     end
 

data/lib/ramesh/version.rb

@@ -1,3 +1,3 @@
 module Ramesh
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/ramesh/client_spec.rb

@@ -26,57 +26,96 @@ module Ramesh
     end
 
     describe "#download_image" do
+      let(:download_image) do
+        client.download_image(minute, tmpdir, filename)
+      end
+
+      let(:minute) do
+        0
+      end
+
+      let(:filename) do
+        nil
+      end
+
       before do
         image = double(write: true)
         allow(Image).to receive(:download_image).and_return(image)
         allow_any_instance_of(Image).to receive(:composite_images).and_return(image)
       end
 
-      context "when minute is not specified" do
-        it "should download the current image" do
-          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "201405091845").once
-          client.download_image(tmpdir)
-        end
-
-        it "should log the result" do
-          expect(logger).to receive(:info).with("Downloaded: 201405091845.jpg")
-          client.download_image(tmpdir)
+      context "when valid minute is specified" do
+        let(:minute) do
+          30
         end
-      end
 
-      context "when valid minute is specified" do
         it "should download the image of the specified minutes ago" do
-          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "201405091815").once
-          client.download_image(tmpdir, 30)
+          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "201405091815.jpg").once
+          download_image
         end
 
         it "should log the result" do
           expect(logger).to receive(:info).with("Downloaded: 201405091815.jpg")
-          client.download_image(tmpdir, 30)
+          download_image
         end
       end
 
       context "when invalid minute is specified" do
+        let(:minute) do
+          7
+        end
+
         it "should raise ArgumentError" do
           expect do
-            client.download_image(tmpdir, 7)
+            download_image
           end.to raise_error ArgumentError
         end
       end
+
+      context "when filename is specified" do
+        let(:filename) do
+          "out.jpg"
+        end
+
+        it "should download the image with specified name" do
+          expect_any_instance_of(Image).to receive(:save).with(tmpdir, "out.jpg").once
+          download_image
+        end
+      end
     end
 
     describe "#download_sequential_images" do
+      let(:download_sequential_images) do
+        client.download_sequential_images(from, to, tmpdir)
+      end
+
       context "when valid section is specified" do
+        let(:from) do
+          0
+        end
+
+        let(:to) do
+          30
+        end
+
         it "should download the images" do
           expect_any_instance_of(Client).to receive(:download_image).exactly(7).times
-          client.download_sequential_images(tmpdir, 0, 30)
+          download_sequential_images
         end
       end
 
       context "when invalid section is specified" do
+        let(:from) do
+          1
+        end
+
+        let(:to) do
+          2
+        end
+
         it "should raise ArgumentError" do
           expect do
-            client.download_sequential_images(tmpdir, 1, 2)
+            download_sequential_images
           end.to raise_error ArgumentError
         end
       end

data/spec/ramesh/image_spec.rb

@@ -7,6 +7,10 @@ module Ramesh
       "201405091845"
     end
 
+    let(:filename) do
+      "201405091845.jpg"
+    end
+
     let(:tmpdir) do
       File.expand_path(File.join("..", "..", "tmp"), __FILE__)
     end
@@ -81,8 +85,8 @@ module Ramesh
 
       it "should save itself to the file" do
         image = described_class.new(image_name)
-        image.save(tmpdir, image_name)
-        expect(File.exist?(File.join(tmpdir, "#{image_name}.jpg"))).to be_truthy
+        image.save(tmpdir, filename)
+        expect(File.exist?(File.join(tmpdir, filename))).to be_truthy
       end
 
       after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramesh
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - dtan4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,4 +198,3 @@ test_files:
 - spec/ramesh/logger_spec.rb
 - spec/ramesh_spec.rb
 - spec/spec_helper.rb
-has_rdoc: