flickr-collage 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62c4f1c184dbd116b567450babda143485aad8a
-  data.tar.gz: 1306652f3315a979a02a77288e9bb70ad7a61f86
+  metadata.gz: 4ac9f62c07d842a292075945629059cc520d72fa
+  data.tar.gz: f0b3e165ace486415118fd05135002d5b572b645
 SHA512:
-  metadata.gz: 9ae6d741258c12034045e114209dad44e8cd7a9068e4325332e34456b3234111ec5ba85c92b1b3648e88c10417ff6c03fb1be38f3eb8a7ea26ebf5ef85f110f2
-  data.tar.gz: 089ad1b4ec36820d4ee34642e8b717264ab4164e505df7280b1700d0a0dcc29e77ae5b78f8a8487efedaa652933f927c7cd060f1da4dba2ae8e37d3293e5194d
+  metadata.gz: 3525bd3ccf47e11a5405820da7813244fdfbae16cbc8204f10d9c468e00261441f314f7af526482ed4f6579bb3a7bb0f81c1c4ed2b9328c4fb99847e9f001dd7
+  data.tar.gz: 76cff62df023f04ef75db9e35ce1ea8c637749ffada382693503069ec341261bfe866a73b7e89172c695a7f1ac54879eee5b9d966e638aec3e78d4b57a389292

data/exe/flickr-collage

@@ -25,6 +25,7 @@ module Flickr
       option :keywords,     type: :array,  desc: 'Keywords to search on Flickr'
       option :columns,      type: :numeric, desc: 'Number of columns on the collage'
       def create(filename = nil)
+        return unless check_config
         Collage.verbose! if options[:verbose]
 
         opts = Hashie::Mash.new(options.to_h)
@@ -37,6 +38,15 @@ module Flickr
         service.top_photos(*opts[:keywords])
         maker.create(opts)
       end
+
+      private
+
+      def check_config
+        return true if (Collage.config.api_key and Collage.config.secret) or (options[:api_key] and options[:secret])
+
+        puts "You must specify Flickr creadentials to use flickr-collage."
+        puts "Use config command or pass your credentials using --api_key and --secret options."
+      end
     end
   end
 end

data/lib/flickr/collage/config.rb

@@ -26,6 +26,8 @@ module Flickr
       end
 
       def load(config_path = DEFAULT_CONFIG_PATH)
+        return Hashie::Mash.new unless File.exist?(config_path)
+
         self.data = Hashie::Mash.new(YAML.load_file(config_path))
       end
 

data/lib/flickr/collage/version.rb

@@ -1,5 +1,5 @@
 module Flickr
   module Collage
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr-collage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dieter Pisarewski