flickr-collage 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e62c4f1c184dbd116b567450babda143485aad8a
4
- data.tar.gz: 1306652f3315a979a02a77288e9bb70ad7a61f86
3
+ metadata.gz: 4ac9f62c07d842a292075945629059cc520d72fa
4
+ data.tar.gz: f0b3e165ace486415118fd05135002d5b572b645
5
5
  SHA512:
6
- metadata.gz: 9ae6d741258c12034045e114209dad44e8cd7a9068e4325332e34456b3234111ec5ba85c92b1b3648e88c10417ff6c03fb1be38f3eb8a7ea26ebf5ef85f110f2
7
- data.tar.gz: 089ad1b4ec36820d4ee34642e8b717264ab4164e505df7280b1700d0a0dcc29e77ae5b78f8a8487efedaa652933f927c7cd060f1da4dba2ae8e37d3293e5194d
6
+ metadata.gz: 3525bd3ccf47e11a5405820da7813244fdfbae16cbc8204f10d9c468e00261441f314f7af526482ed4f6579bb3a7bb0f81c1c4ed2b9328c4fb99847e9f001dd7
7
+ data.tar.gz: 76cff62df023f04ef75db9e35ce1ea8c637749ffada382693503069ec341261bfe866a73b7e89172c695a7f1ac54879eee5b9d966e638aec3e78d4b57a389292
@@ -25,6 +25,7 @@ module Flickr
25
25
  option :keywords, type: :array, desc: 'Keywords to search on Flickr'
26
26
  option :columns, type: :numeric, desc: 'Number of columns on the collage'
27
27
  def create(filename = nil)
28
+ return unless check_config
28
29
  Collage.verbose! if options[:verbose]
29
30
 
30
31
  opts = Hashie::Mash.new(options.to_h)
@@ -37,6 +38,15 @@ module Flickr
37
38
  service.top_photos(*opts[:keywords])
38
39
  maker.create(opts)
39
40
  end
41
+
42
+ private
43
+
44
+ def check_config
45
+ return true if (Collage.config.api_key and Collage.config.secret) or (options[:api_key] and options[:secret])
46
+
47
+ puts "You must specify Flickr creadentials to use flickr-collage."
48
+ puts "Use config command or pass your credentials using --api_key and --secret options."
49
+ end
40
50
  end
41
51
  end
42
52
  end
@@ -26,6 +26,8 @@ module Flickr
26
26
  end
27
27
 
28
28
  def load(config_path = DEFAULT_CONFIG_PATH)
29
+ return Hashie::Mash.new unless File.exist?(config_path)
30
+
29
31
  self.data = Hashie::Mash.new(YAML.load_file(config_path))
30
32
  end
31
33
 
@@ -1,5 +1,5 @@
1
1
  module Flickr
2
2
  module Collage
3
- VERSION = '0.1.1'
3
+ VERSION = '0.1.2'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flickr-collage
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dieter Pisarewski